fix in handling of unset end date for agenda portlet
This commit is contained in:
parent
c9c1b5ff8f
commit
665bed735c
|
@ -90,7 +90,10 @@ class MonthlyView:
|
|||
'day': daynumber}
|
||||
includedevents = []
|
||||
for result in query:
|
||||
result.end = DateTime(result.end)
|
||||
if result.end is None:
|
||||
result.end = DateTime(result.start)
|
||||
else:
|
||||
result.end = DateTime(result.end)
|
||||
result.start = DateTime(result.start)
|
||||
if result.getRID() in includedevents:
|
||||
break
|
||||
|
@ -98,7 +101,7 @@ class MonthlyView:
|
|||
includedevents.append(result.getRID())
|
||||
event={}
|
||||
# we need to deal with events that end next month
|
||||
if result.end.greaterThan(last_date):
|
||||
if result.end is None or result.end.greaterThan(last_date):
|
||||
eventEndDay = last_day
|
||||
event['end'] = None
|
||||
else:
|
||||
|
@ -138,8 +141,7 @@ class MonthlyView:
|
|||
'id': event['id']} )
|
||||
eventDays[eventday]['event'] = 1
|
||||
|
||||
if (result.end == result.end.earliestTime() and
|
||||
event['end'] is not None):
|
||||
if (event['end'] is not None and result.end == result.end.earliestTime()):
|
||||
# ends some day this month at midnight
|
||||
last_day_data = eventDays[allEventDays[-2]]
|
||||
last_days_event = last_day_data['eventslist'][-1]
|
||||
|
@ -219,6 +221,11 @@ class MonthlyView:
|
|||
start = event.get('start') and ':'.join(event.get('start').split(':')[:2]) or ''
|
||||
end = event.get('end') and ':'.join(event.get('end').split(':')[:2]) or ''
|
||||
title = safe_unicode(event.get('title')) or u'event'
|
||||
if start == end:
|
||||
end = None
|
||||
if start == '00:00':
|
||||
start = None
|
||||
end = None
|
||||
|
||||
if start and end:
|
||||
eventstring = "%s-%s %s" % (start, end, title)
|
||||
|
|
Reference in New Issue