Commit 029975ca authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch...

Merge branch '516-als-admin-is-de-tijd-die-in-het-evenementenoverzicht-staat-hetzelfde-als-de-tijd-die-staat-ingesteld-bij-het-evenement' into 'master'

Made the start date a naive when being sent to the admin overview page.

Closes #516

See merge request thalia/concrexit!626
parents 9035c25c bf2016e8
......@@ -78,12 +78,16 @@ class EventAdmin(DoNextModelAdmin):
return super().has_change_permission(request, event)
def event_date(self, obj):
event_date = obj.start
event_date = timezone.make_naive(obj.start)
return _date(event_date, "l d b Y, G:i")
event_date.short_description = _('Event Date')
def registration_date(self, obj):
start_date = obj.registration_start
if obj.registration_start is not None:
start_date = timezone.make_naive(obj.registration_start)
start_date = obj.registration_start
return _date(start_date, "l d b Y, G:i")
registration_date.short_description = _('Registration Start')
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment