From 44ffc0685ee2d8a0b003cee11ffb60d8976f80ff Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 16 Jul 2019 09:31:40 +0200 Subject: [PATCH] Show date_to in PDF variable "event_date_range" regardless of event settings Z#2349533 --- src/pretix/base/models/event.py | 4 ++-- src/pretix/base/pdf.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pretix/base/models/event.py b/src/pretix/base/models/event.py index 04c116547..7eb67dd1b 100644 --- a/src/pretix/base/models/event.py +++ b/src/pretix/base/models/event.py @@ -100,14 +100,14 @@ class EventMixin: "DATETIME_FORMAT" if self.settings.show_times else "DATE_FORMAT" ) - def get_date_range_display(self, tz=None) -> str: + def get_date_range_display(self, tz=None, force_show_end=False) -> str: """ Returns a formatted string containing the start date and the end date of the event with respect to the current locale and to the ``show_times`` and ``show_date_to`` settings. """ tz = tz or self.timezone - if not self.settings.show_date_to or not self.date_to: + if (not self.settings.show_date_to and not force_show_end) or not self.date_to: return _date(self.date_from.astimezone(tz), "DATE_FORMAT") return daterange(self.date_from.astimezone(tz), self.date_to.astimezone(tz)) diff --git a/src/pretix/base/pdf.py b/src/pretix/base/pdf.py index 23b69ec5c..29024e284 100644 --- a/src/pretix/base/pdf.py +++ b/src/pretix/base/pdf.py @@ -114,7 +114,7 @@ DEFAULT_VARIABLES = OrderedDict(( ("event_date_range", { "label": _("Event date range"), "editor_sample": _("May 31st – June 4th, 2017"), - "evaluate": lambda op, order, ev: ev.get_date_range_display() + "evaluate": lambda op, order, ev: ev.get_date_range_display(force_show_end=True) }), ("event_begin", { "label": _("Event begin date and time"),