From b586a5281348d73daad5a5af22e2a9f78284bde5 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 11 Aug 2022 16:14:37 +0200 Subject: [PATCH] Improve settings link for propagated settings --- .../pretixcontrol/event/settings.html | 18 ++++++++++-------- .../control/templatetags/hierarkey_form.py | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/pretix/control/templates/pretixcontrol/event/settings.html b/src/pretix/control/templates/pretixcontrol/event/settings.html index 92029cf9bc..0a01f8be2f 100644 --- a/src/pretix/control/templates/pretixcontrol/event/settings.html +++ b/src/pretix/control/templates/pretixcontrol/event/settings.html @@ -207,14 +207,16 @@ {% bootstrap_field sform.logo_show_title layout="control" %} {% bootstrap_field sform.og_image layout="control" %} {% url "control:organizer.edit" organizer=request.organizer.slug as org_url %} - {% propagated request.event org_url "primary_color" "primary_font" "theme_color_success" "theme_color_danger" "theme_color_background" "theme_round_borders" %} - {% bootstrap_field sform.primary_color layout="control" %} - {% bootstrap_field sform.theme_color_success layout="control" %} - {% bootstrap_field sform.theme_color_danger layout="control" %} - {% bootstrap_field sform.theme_color_background layout="control" %} - {% bootstrap_field sform.theme_round_borders layout="control" %} - {% bootstrap_field sform.primary_font layout="control" %} - {% endpropagated %} + {% with org_url|add:"#tab-0-4-open" as org_url_tab %} + {% propagated request.event org_url_tab "primary_color" "primary_font" "theme_color_success" "theme_color_danger" "theme_color_background" "theme_round_borders" %} + {% bootstrap_field sform.primary_color layout="control" %} + {% bootstrap_field sform.theme_color_success layout="control" %} + {% bootstrap_field sform.theme_color_danger layout="control" %} + {% bootstrap_field sform.theme_color_background layout="control" %} + {% bootstrap_field sform.theme_round_borders layout="control" %} + {% bootstrap_field sform.primary_font layout="control" %} + {% endpropagated %} + {% endwith %}
{% trans "Timeline" %} diff --git a/src/pretix/control/templatetags/hierarkey_form.py b/src/pretix/control/templatetags/hierarkey_form.py index 954dcf9ec0..abf7371a6a 100644 --- a/src/pretix/control/templatetags/hierarkey_form.py +++ b/src/pretix/control/templatetags/hierarkey_form.py @@ -55,7 +55,7 @@ class PropagatedNode(Node):
{text_expl}
- + {text_orga}