Fix computing meeting updated timestamp when there's either a timeslot

or a session but not both
 - Legacy-Id: 6855
This commit is contained in:
Ole Laursen 2013-12-09 10:52:31 +00:00
parent 3053bef4cc
commit 371c4bb344

View file

@ -134,8 +134,8 @@ def get_schedule_by_id(meeting, schedid):
return schedule
def meeting_updated(meeting):
ts = max(meeting.timeslot_set.aggregate(Max('modified'))["modified__max"],
meeting.session_set.aggregate(Max('modified'))["modified__max"])
ts = max(meeting.timeslot_set.aggregate(Max('modified'))["modified__max"] or datetime.datetime.min,
meeting.session_set.aggregate(Max('modified'))["modified__max"] or datetime.datetime.min)
tz = pytz.timezone(settings.PRODUCTION_TIMEZONE)
ts = tz.localize(ts)
return ts