fix merge conflict

fet2020/fet2020/settings.py

@@ -86,7 +86,7 @@ TEMPLATES = [
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
             os.path.join(BASE_DIR, 'templates'),
-            os.path.join(BASE_DIR, 'templates_design1')
+            os.path.join(BASE_DIR, 'templates_design1'),
         ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -114,7 +114,7 @@ DATABASES = {
 }
 
 AUTHENTICATION_BACKENDS = [
-    'django.contrib.auth.backends.RemoteUserBackend'
+    'django.contrib.auth.backends.RemoteUserBackend',
 ]
 
 # Password validation
@@ -181,6 +181,7 @@ CKEDITOR_CONFIGS = {
         ],
     }
 }
+
 THUMBNAIL_ALIASES = {
     '': {
         'avatar': {'size': (50, 50), 'crop': True},

fet2020/fet2020/views.py

@@ -2,12 +2,11 @@ from django.shortcuts import render
 # from django.http import HttpResponse
 from collections import deque
 from posts.models import Post, FetMeeting, Event
-from django.utils import timezone
+
-from django.db.models import Q
 
 def index(request):
     posts = deque(Post.article_objects.all())
-    date_today = timezone.now().date()
+
     def get_tags(lst):
         for p in lst:
             for t in list(p.tags.names()):
@@ -21,7 +20,7 @@ def index(request):
 
     context = {
         'posts': posts,
-        'events': Post.objects.filter(is_event=True).filter(Q(event_start__gt=date_today)).order_by('-public_date').all(),
+        'events': Event.objects.get_all_events(),
         'featured_post': featured_post,
         'featured_post2': FetMeeting.objects.first(),
         'tags_list': ", ".join(t)

fet2020/members/views.py

@@ -38,27 +38,6 @@ def index(request, slug=None, filter=None):
 
     return render(request, 'members/index.html', context)
 
-<<<<<<< HEAD
-def show_job(request, slug=None):
-    job=Job.objects.get(slug=slug)
-    return render(request, 'members/show_job.html', {"job": job})
-
-def show_member(request, slug=None):
-    member=Member.objects.get()
-    return render(request, 'members/show_member.html', {"member": member})
-
-def list(request, filter=None):
-    """
-        View for a list of members filtered or not
-    """
-    if filter is None: 
-        members = deque(Member.all_members.all())
-    if filter in Member.role_choices:
-        members=deque(Member.all_members.filter(role=filter).all())
-
-    return render(request, 'members/list.html',{"members": members})
-=======
->>>>>>> origin/master
 
 class MemberViewSet(viewsets.ModelViewSet):
     """

fet2020/posts/admin.py

@@ -11,10 +11,14 @@ admin.site.unregister(auth.models.User)
 admin.site.unregister(auth.models.Group)
 admin.site.unregister(taggit.models.Tag)
 
+
 def make_fetmeeting(modeladmin, request, queryset):
-    queryset.update(post_type ='F')
+    queryset.update(post_type='F')
+
+
 make_fetmeeting.short_description = "In eine Fachschaftssitzung konvertieren"
 
+
 class MyPostAdmin(admin.ModelAdmin):
     form = MyPostForm
     model = Post
@@ -41,7 +45,8 @@ class MyEventAdmin(MyPostAdmin):
     form = MyEventForm
     model = Event
     list_display = ['title', 'subtitle', 'slug', 'event_start', 'public_date']
-    actions=[make_fetmeeting]
+    actions = [make_fetmeeting]
+
 
 admin.site.register(Event, MyEventAdmin)
 

fet2020/posts/models.py

@@ -34,7 +34,10 @@ class ArticleManager(models.Manager):
     regular fet meetings should not be contained in the news stream
     """
     def get_queryset(self):
-        return super().get_queryset().filter(Q(post_type='E') | Q(post_type='N')).order_by('-public_date')
+        return super().get_queryset().filter(
+            Q(post_type='E')
+            | Q(post_type='N')
+        ).order_by('-public_date')
 
 
 class NewsManager(models.Manager):
@@ -48,7 +51,17 @@ class EventManager(models.Manager):
     regular fet meetings should not be contained in the news stream
     """
     def get_queryset(self):
-        return super().get_queryset().filter(Q(is_event=True) & ~Q(post_type='F')).order_by('-public_date')
+        return super().get_queryset().filter(
+            Q(is_event=True)
+            & ~Q(post_type='F')
+        ).order_by('-public_date')
+
+    def get_all_events(self):
+        date_today = timezone.now().date()
+        return super().get_queryset().filter(
+            Q(is_event=True)
+            & Q(event_start__gt=date_today)
+        ).order_by('-public_date')
 
 
 class FetMeetingManager(models.Manager):