edb/infoskjerm2
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix active/inactive slides

Browse Source
This commit is contained in:
Nikolai R Kristiansen committed 2017-02-08 22:45:17 +01:00
1 parent 3f61dbf056
commit 5daf2e1052
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
slides/models.py
+3 -3
View File
@@ -11,8 +11,8 @@ class DateLimitedActivatorQuerySet(models.query.QuerySet):
def get_date_query(self):
today = date.today()
return (
Q(activate_date__gte=today, deactivate_date__lte=today)
| Q(activate_date__gte=today, deactivate_date__isnull=True))
Q(activate_date__lte=today, deactivate_date__isnull=True)
| Q(activate_date__lte=today, deactivate_date__gte=today))
def active(self):
""" Returns active query set """
@@ -20,7 +20,7 @@ class DateLimitedActivatorQuerySet(models.query.QuerySet):
def inactive(self):
""" Returns inactive query set """
return self.filter(status=Slide.INACTIVE_STATUS).filter(Q(~self.get_date_query()))
return self.filter(Q(status=Slide.INACTIVE_STATUS) | Q(~self.get_date_query()))
class DateLimitedActivatorModelManager(models.Manager):