From 5daf2e105202ea3858cc1462f3eac53a75363559 Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Wed, 8 Feb 2017 22:45:17 +0100 Subject: [PATCH] fix active/inactive slides --- slides/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/models.py b/slides/models.py index 7c1c7b6..979f7c8 100644 --- a/slides/models.py +++ b/slides/models.py @@ -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):