Added a setting where the exported excel files should be stored.
Added a option to send the exported excel as mail attachment.
This commit is contained in:
@@ -3,7 +3,7 @@ from ckeditor_uploader.fields import RichTextUploadingField
|
||||
from django.conf import settings
|
||||
from django.core.cache import cache
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.db import models
|
||||
from django.template.defaultfilters import slugify
|
||||
from django.utils import timezone
|
||||
@@ -262,7 +262,7 @@ class Page(models.Model):
|
||||
def content(self):
|
||||
"""Return the localized content, fallback to german if necessary."""
|
||||
return mark_safe(
|
||||
getattr(self, "content_%s" % get_language(), self.content_de)
|
||||
getattr(self, "content_%s" % get_language()) or self.content_de
|
||||
)
|
||||
|
||||
@property
|
||||
@@ -275,13 +275,12 @@ class Page(models.Model):
|
||||
@property
|
||||
def description(self):
|
||||
"""Return the localized description, fallback to german if necessary."""
|
||||
return getattr(self, "description_%s" % get_language(),
|
||||
self.description_de)
|
||||
return getattr(self, "description_%s" % get_language()) or self.description_de
|
||||
|
||||
@property
|
||||
def menu_name(self):
|
||||
"""Return the localized menu name, fallback to german if necessary."""
|
||||
return getattr(self, "menu_name_%s" % get_language(), self.menu_name_de)
|
||||
return getattr(self, "menu_name_%s" % get_language()) or self.menu_name_de
|
||||
|
||||
@property
|
||||
def pdf_file(self):
|
||||
@@ -291,7 +290,7 @@ class Page(models.Model):
|
||||
@property
|
||||
def title(self):
|
||||
"""Return the localized title, fallback to german if necessary."""
|
||||
return getattr(self, "title_%s" % get_language(), self.title_de)
|
||||
return getattr(self, "title_%s" % get_language()) or self.title_de
|
||||
|
||||
def clean(self):
|
||||
"""set the URL path, the right content type, and scrub the HTML code."""
|
||||
|
||||
@@ -4,7 +4,7 @@ import os
|
||||
from ckeditor.fields import RichTextField
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.db import models
|
||||
from django.db.models import Q
|
||||
from django.template.defaultfilters import slugify
|
||||
|
||||
@@ -3,7 +3,7 @@ from datetime import timedelta
|
||||
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth.mixins import PermissionRequiredMixin
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.db.models import Q
|
||||
from django.http import HttpResponse, Http404
|
||||
from django.shortcuts import redirect
|
||||
|
||||
@@ -7,7 +7,7 @@ from django.contrib import auth
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin, \
|
||||
PermissionRequiredMixin
|
||||
from django.contrib.messages.views import SuccessMessageMixin
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.utils.translation import ugettext as _
|
||||
from django.views import generic
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import logging
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.db import models
|
||||
from django.db.models.signals import post_delete, post_save
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
from datetime import date
|
||||
|
||||
from django.contrib import auth
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.views import generic
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ from os import path
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import AbstractUser
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.db import models
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import ugettext as _
|
||||
@@ -226,8 +226,8 @@ class Membership(AbstractUser):
|
||||
"""Save the Useraccount, and add him tho the "Paid Membership" group
|
||||
if he activated the "membership" checkbox and has been validated.
|
||||
|
||||
:param args: passed through the save() method from django
|
||||
:param kwargs: passed through the save() method from django
|
||||
:param args: passed through the save() method from django
|
||||
:param kwargs: passed through the save() method from django
|
||||
"""
|
||||
super(Membership, self).save(*args, **kwargs)
|
||||
if self.confirmed:
|
||||
|
||||
@@ -7,7 +7,7 @@ from django import http
|
||||
from django.conf import settings
|
||||
from django.contrib import auth, messages
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.http import Http404
|
||||
from django.utils.decorators import method_decorator
|
||||
from django.utils.translation import ugettext as _
|
||||
@@ -114,7 +114,7 @@ class MembershipDetail(LoginRequiredMixin, generic.DetailView):
|
||||
def get_context_data(self, **kwargs):
|
||||
""" Add the ladder ranking and the Kyu and Dan ranking the user profile.
|
||||
|
||||
:return: array with the context data
|
||||
:return: array with the context data
|
||||
"""
|
||||
context = generic.DetailView.get_context_data(self, **kwargs)
|
||||
try:
|
||||
@@ -139,11 +139,11 @@ class RegisterForm(generic.FormView):
|
||||
|
||||
@method_decorator(csp_update(**RECAPTCHA_CSP))
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
"""Overwrite to add googles recaptcha ressoruces to the
|
||||
"""Overwrite to add googles recaptcha ressoruces to the
|
||||
Content-Security_Policity HTTP Headers.
|
||||
:param request:
|
||||
:param args:
|
||||
:param kwargs:
|
||||
:param request:
|
||||
:param args:
|
||||
:param kwargs:
|
||||
:return: """
|
||||
return super(RegisterForm, self).dispatch(request, *args, **kwargs)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user