Vereinfachung Membership ist nun ein custom login model, keine Abhängikeiten mehr zu auth.User.

absofort können alle Benutzer ins Ranking eingetragen werden und nicht mehr nur "zahlende Mitglieder".

src/content/views.py

@@ -1,21 +1,29 @@
 # Create your views here.
-import os
 
-from django.conf import settings
 import django_comments as comments
-
+import os
+from django.conf import settings
 from django.http import HttpResponse, Http404
 from django.utils.translation import ugettext as _
 from django.views import generic
-from django.shortcuts import get_object_or_404
 
 from . import models, forms
 from aggregator.models import Feed
+from events.models import Photo
 from utils.mixins import PermissionRequiredMixin
-import events.models
 
 
 class ArticleArchiveMixin(object):
+    def get_category(self, queryset):
+        try:
+            self.category = models.Category.objects.get(slug=self.kwargs['category'])
+            return queryset.filter(category=self.category)
+        except models.Category.DoesNotExist:
+            raise Http404(_("This Category does not exist."))
+        except KeyError:
+            self.category = None
+            return self.queryset
+
     def get_context_data(self, **kwargs):
         context = super(ArticleArchiveMixin, self).get_context_data(**kwargs)
         context['categories'] = models.Category.objects.all()
@@ -24,7 +32,6 @@ class ArticleArchiveMixin(object):
         return context
 
 
-# noinspection PyAttributeOutsideInit
 class ArticleArchiveIndex(ArticleArchiveMixin, generic.ArchiveIndexView):
     queryset = models.Article.objects.filter(status=models.STATUS_PUBLISHED)
     date_field = 'date_created'
@@ -34,13 +41,7 @@ class ArticleArchiveIndex(ArticleArchiveMixin, generic.ArchiveIndexView):
 
     def get_queryset(self):
         queryset = generic.ArchiveIndexView.get_queryset(self)
-        self.category = self.kwargs.get('category')
-        if self.category:
-            try:
-                self.category = models.Category.objects.get(slug=self.category)
-                queryset = queryset.filter(category=self.category)
-            except models.Category.DoesNotExist:
-                raise Http404(_("This Category does not exist."))
+        queryset = self.get_category(queryset)
         return queryset
 
 
@@ -54,11 +55,7 @@ class ArticleYearArchive(ArticleArchiveMixin, generic.YearArchiveView):
 
     def get_queryset(self):
         queryset = generic.YearArchiveView.get_queryset(self)
-        self.category = self.kwargs.get('category')
-        if self.category:
-            self.category = get_object_or_404(models.Category,
-                                              slug=self.category)
-            queryset = queryset.filter(category=self.category)
+        queryset = self.get_category(queryset)
         return queryset
 
 
@@ -72,10 +69,7 @@ class ArticleMonthArchive(ArticleArchiveMixin, generic.MonthArchiveView):
 
     def get_queryset(self):
         queryset = generic.MonthArchiveView.get_queryset(self)
-        self.category = self.kwargs.get('category')
-        if self.category:
-            self.category = models.Category.objects.get(slug=self.category)
-            queryset = queryset.filter(category=self.category)
+        queryset = self.get_category(queryset)
         return queryset
 
 
@@ -208,7 +202,7 @@ class StartPage(generic.TemplateView):
 
     def get_context_data(self, **kwargs):
         page = models.Page.objects.get(slug='index')
-        random_photo = events.models.Photo.objects.get_random(startpage=True)
+        random_photo = Photo.objects.get_random(startpage=True)
         recent_comment_list = comments.get_model().objects.filter(
             site__pk=settings.SITE_ID,
             is_public=True,