cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix date selection for events that span more than one day

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3911 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2010-06-29 07:45:11 +00:00
parent 00ae2f6a99
commit 4b3f4bfe98
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
organize/browser/event.py
View file

@ -67,7 +67,7 @@ class Events(ConceptView):
month = int(self.request.get('cal_month') or 0) month = int(self.request.get('cal_month') or 0)
day = int(self.request.get('cal_day') or 0) day = int(self.request.get('cal_day') or 0)
if year and month and day: if year and month and day:
return datetime(year, month, day) return date(year, month, day)
return None return None
def events(self): def events(self):
@ -81,10 +81,10 @@ class Events(ConceptView):
relViews = (self.childViewFactory(r, self.request, contextIsSecond=True) relViews = (self.childViewFactory(r, self.request, contextIsSecond=True)
for r in tEvent.getChildRelations([hasType], sort=None)) for r in tEvent.getChildRelations([hasType], sort=None))
if self.selectedDate: if self.selectedDate:
end = self.selectedDate + timedelta(1) #end = self.selectedDate + timedelta(1)
return sorted((rv for rv in relViews return sorted((rv for rv in relViews
if rv.adapted.start >= self.selectedDate and if rv.adapted.start.date() <= self.selectedDate and
rv.adapted.start < end), rv.adapted.end.date() >= self.selectedDate),
key=sort) key=sort)
else: else:
return sorted((rv for rv in relViews return sorted((rv for rv in relViews