From 39ae22b8b207d4c24e06e4fb873ab32dde20d8db Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 22 May 2020 11:54:37 +0200 Subject: [PATCH] Calendar view: Consistent sorting of events at the same time --- src/pretix/presale/views/organizer.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pretix/presale/views/organizer.py b/src/pretix/presale/views/organizer.py index cfd2c34869..60a7e757e5 100644 --- a/src/pretix/presale/views/organizer.py +++ b/src/pretix/presale/views/organizer.py @@ -407,7 +407,7 @@ def days_for_template(ebd, week): { 'day_formatted': date_format(day, day_format), 'date': day, - 'events': ebd.get(day) + 'events': sorted(ebd.get(day), key=lambda e: (e['time'], str(e['event']))) if day in ebd else [] } for day in week.days() ] @@ -420,7 +420,10 @@ def weeks_for_template(ebd, year, month): { 'day': day, 'date': date(year, month, day), - 'events': ebd.get(date(year, month, day)) + 'events': ( + sorted(ebd.get(date(year, month, day)), key=lambda e: (e['time'], str(e['event']))) + if date(year, month, day) in ebd else None + ) } if day > 0 else None