CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-10 16:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow template syntax in event text (Z#23140046) (#3815)

Browse Source 
* remove duplicate context generation

* allow text templates in frontpage_text

* refactor: move placeholder functionality to separate file

* fix wrong class name, code style

* update year in license header

* undo license header update

* use new function name

* render only the placeholders that are actually used in the message

* refactoring

* add str(...) call

* Update doc/development/api/placeholder.rst

Co-authored-by: Raphael Michel <michel@rami.io>

* rename register_mail_placeholders to register_template_placeholders
(deprecate old name)

* isort

* add signals to docs

---------

Co-authored-by: Raphael Michel <michel@rami.io>
This commit is contained in:
Mira
2024-02-06 11:32:03 +01:00
committed by GitHub
parent 45ac391998
commit bac673f3ab
13 changed files with 654 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/presale/views/event.py
View File

@@ -67,6 +67,7 @@ from pretix.base.models.event import Event, SubEvent
from pretix.base.models.items import (
ItemAddOn, ItemBundle, SubEventItem, SubEventItemVariation,
)
from pretix.base.services.placeholders import PlaceholderContext
from pretix.base.services.quotas import QuotaAvailability
from pretix.helpers.compat import date_fromisocalendar
from pretix.multidomain.urlreverse import eventreverse
@@ -590,10 +591,11 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
context['cart'] = self.get_cart()
context['has_addon_choices'] = any(cp.has_addon_choices for cp in get_cart(self.request))
templating_context = PlaceholderContext(event_or_subevent=self.subevent or self.request.event, event=self.request.event)
if self.subevent:
context['frontpage_text'] = str(self.subevent.frontpage_text)
context['frontpage_text'] = templating_context.format(str(self.subevent.frontpage_text))
else:
context['frontpage_text'] = str(self.request.event.settings.frontpage_text)
context['frontpage_text'] = templating_context.format(str(self.request.event.settings.frontpage_text))
if self.request.event.has_subevents:
context['subevent_list'] = SimpleLazyObject(self._subevent_list_context)

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

@@ -58,6 +58,7 @@ from pretix.base.models import (
CartPosition, Event, ItemVariation, Quota, SubEvent, Voucher,
)
from pretix.base.services.cart import error_messages
from pretix.base.services.placeholders import PlaceholderContext
from pretix.base.settings import GlobalSettingsObject
from pretix.base.templatetags.rich_text import rich_text
from pretix.helpers.daterange import daterange
@@ -699,11 +700,13 @@ class WidgetAPIProductList(EventListMixin, View):
ev = self.subevent or request.event
data['name'] = str(ev.name)
templating_context = PlaceholderContext(event_or_subevent=ev, event=request.event)
if self.subevent:
data['frontpage_text'] = str(rich_text(self.subevent.frontpage_text, safelinks=False))
data['frontpage_text'] = str(rich_text(templating_context.format(str(self.subevent.frontpage_text)), safelinks=False))
data['location'] = str(rich_text(self.subevent.location, safelinks=False))
else:
data['frontpage_text'] = str(rich_text(request.event.settings.frontpage_text, safelinks=False))
data['frontpage_text'] = str(rich_text(templating_context.format(str(request.event.settings.frontpage_text)), safelinks=False))
data['location'] = str(rich_text(request.event.location, safelinks=False))
data['date_range'] = self._get_date_range(ev, request.event)
fail = False