From d6c1bf469cd7ebcd0dac274157a75ffbb0a34a2d Mon Sep 17 00:00:00 2001 From: Bezleputh Date: Sat, 16 May 2015 18:07:06 +0200 Subject: [PATCH] [hybride] improve end_date management --- modules/hybride/pages.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/hybride/pages.py b/modules/hybride/pages.py index 92d823c9..62b0bf7c 100644 --- a/modules/hybride/pages.py +++ b/modules/hybride/pages.py @@ -49,11 +49,10 @@ class ProgramPage(HTMLPage): if self.env['date_from'] and obj.start_date >= self.env['date_from']: if not self.env['date_to']: return True - elif not obj.end_date: + elif obj.end_date and obj.end_date <= self.env['date_to']: + return True + elif self.env['date_to'] >= obj.start_date: return True - else: - if obj.end_date <= self.env['date_to']: - return True return False def check_city(self, obj):