From 4b3f4bfe98f5ed57656e2831fe5ddc0dca5b3e3c Mon Sep 17 00:00:00 2001 From: helmutm Date: Tue, 29 Jun 2010 07:45:11 +0000 Subject: [PATCH] fix date selection for events that span more than one day git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3911 fd906abe-77d9-0310-91a1-e0d9ade77398 --- organize/browser/event.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/organize/browser/event.py b/organize/browser/event.py index 105712d..7c8131d 100644 --- a/organize/browser/event.py +++ b/organize/browser/event.py @@ -67,7 +67,7 @@ class Events(ConceptView): month = int(self.request.get('cal_month') or 0) day = int(self.request.get('cal_day') or 0) if year and month and day: - return datetime(year, month, day) + return date(year, month, day) return None def events(self): @@ -81,10 +81,10 @@ class Events(ConceptView): relViews = (self.childViewFactory(r, self.request, contextIsSecond=True) for r in tEvent.getChildRelations([hasType], sort=None)) if self.selectedDate: - end = self.selectedDate + timedelta(1) + #end = self.selectedDate + timedelta(1) return sorted((rv for rv in relViews - if rv.adapted.start >= self.selectedDate and - rv.adapted.start < end), + if rv.adapted.start.date() <= self.selectedDate and + rv.adapted.end.date() >= self.selectedDate), key=sort) else: return sorted((rv for rv in relViews