diff --git a/AKModel/admin.py b/AKModel/admin.py index 962293cb93594d1a0b1bd9bf57da039bacdb693f..6a60c38e19ed6f4afd0378b8e373088823175577 100644 --- a/AKModel/admin.py +++ b/AKModel/admin.py @@ -412,6 +412,12 @@ class DefaultSlotAdminForm(forms.ModelForm): @admin.register(DefaultSlot) class DefaultSlotAdmin(admin.ModelAdmin): - list_display = ['start', 'end', 'event'] + list_display = ['start_simplified', 'end_simplified', 'event'] list_filter = ['event'] form = DefaultSlotAdminForm + + def get_form(self, request, obj=None, change=False, **kwargs): + # Use timezone of event + if obj is not None: + timezone.activate(obj.event.timezone) + return super().get_form(request, obj, change, **kwargs)