From 3a774db6418f3e6b81dbaa576d5accc6e66bb55a Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Thu, 8 Aug 2024 16:36:26 +0200 Subject: [PATCH] Refactor --- src/pretix/base/models/event.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pretix/base/models/event.py b/src/pretix/base/models/event.py index 635588645b..8a02cf5ebe 100644 --- a/src/pretix/base/models/event.py +++ b/src/pretix/base/models/event.py @@ -60,7 +60,6 @@ from django.urls import reverse from django.utils.crypto import get_random_string from django.utils.formats import date_format from django.utils.functional import cached_property -from django.utils.html import format_html from django.utils.timezone import make_aware, now from django.utils.translation import gettext, gettext_lazy as _ from django_scopes import ScopedManager, scopes_disabled @@ -180,8 +179,10 @@ class EventMixin: """ tz = tz or self.timezone if (not self.settings.show_date_to and not force_show_end) or not self.date_to: - return daterange(self.date_from.astimezone(tz), self.date_from.astimezone(tz), as_html) - return daterange(self.date_from.astimezone(tz), self.date_to.astimezone(tz), as_html) + df, dt = self.date_from, self.date_from + else: + df, dt = self.date_from, self.date_to + return daterange(df.astimezone(tz), dt.astimezone(tz), as_html) def get_date_range_display_as_html(self, tz=None, force_show_end=False) -> str: return self.get_date_range_display(tz, force_show_end, as_html=True)