CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Calendar view: Consistent sorting of events at the same time

Browse Source
This commit is contained in:
Raphael Michel
2020-05-22 11:54:37 +02:00
parent 65b612eabd
commit 39ae22b8b2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pretix/presale/views/organizer.py
View File

@@ -407,7 +407,7 @@ def days_for_template(ebd, week):
{ {
'day_formatted': date_format(day, day_format), 'day_formatted': date_format(day, day_format),
'date': day, '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() for day in week.days()
] ]
@@ -420,7 +420,10 @@ def weeks_for_template(ebd, year, month):
{ {
'day': day, 'day': day,
'date': date(year, month, 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 if day > 0
else None else None