DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

MIGRATION: dav_registration: try to incoorporate feedback from trainers

Browse Source
This commit is contained in:
heinzel
2019-04-01 16:50:34 +02:00
parent 0e1ec5c733
commit aa353ec6a5
8 changed files with 75 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dav_registration/views.py
View File

@@ -37,7 +37,7 @@ class EventListView(generic.ListView):
'published', 'published_web', 'published_facebook'))
filter &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter &= Q(first_day__gte=today)
filter &= Q(deadline__isnull=True) | Q(deadline__gte=today)
# filter &= Q(deadline__isnull=True) | Q(deadline__gte=today)
qs = self.model.objects.filter(filter).order_by('first_day', 'number').distinct()
@@ -55,7 +55,7 @@ class EventDetailView(generic.DetailView):
'published', 'published_web', 'published_facebook'))
filter &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter &= Q(first_day__gte=today)
filter &= Q(deadline__isnull=True) | Q(deadline__gte=today)
# filter &= Q(deadline__isnull=True) | Q(deadline__gte=today)
qs = self.model.objects.filter(filter).distinct()