bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Patrick Mayr
2020-08-24 12:40:00 +00:00
parent cdf1b8c83a
commit cc410ab78a
6 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fet2020/posts/models.py
View File

@@ -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):