From ccc0fac499d55cd4a33ec32051791f94d75995e4 Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Thu, 23 Jan 2025 12:48:32 +0100 Subject: [PATCH] Deduplicate options, use same wording everywhere --- src/pretix/base/models/items.py | 6 +++++- src/pretix/control/forms/item.py | 20 ++++--------------- .../fragment_unavail_mode_indicator.html | 2 +- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py index 69bd61752..b3a51dff7 100644 --- a/src/pretix/base/models/items.py +++ b/src/pretix/base/models/items.py @@ -442,8 +442,12 @@ class Item(LoggedModel): UNAVAIL_MODE_INFO = "info" UNAVAIL_MODES = ( (UNAVAIL_MODE_HIDDEN, _("Hide product if unavailable")), - (UNAVAIL_MODE_INFO, _("Show info text if unavailable")), + (UNAVAIL_MODE_INFO, _("Show product with info on why it’s unavailable")), ) + UNAVAIL_MODE_ICONS = { + UNAVAIL_MODE_HIDDEN: 'eye-slash', + UNAVAIL_MODE_INFO: 'info' + } MEDIA_POLICY_REUSE = 'reuse' MEDIA_POLICY_NEW = 'new' diff --git a/src/pretix/control/forms/item.py b/src/pretix/control/forms/item.py index 1d7831284..29652baa9 100644 --- a/src/pretix/control/forms/item.py +++ b/src/pretix/control/forms/item.py @@ -646,18 +646,12 @@ class ItemUpdateForm(I18nModelForm): self.fields['available_from_mode'].widget = ButtonGroupRadioSelect( choices=self.fields['available_from_mode'].choices, - option_icons={ - Item.UNAVAIL_MODE_HIDDEN: 'eye-slash', - Item.UNAVAIL_MODE_INFO: 'info' - } + option_icons=Item.UNAVAIL_MODE_ICONS ) self.fields['available_until_mode'].widget = ButtonGroupRadioSelect( choices=self.fields['available_until_mode'].choices, - option_icons={ - Item.UNAVAIL_MODE_HIDDEN: 'eye-slash', - Item.UNAVAIL_MODE_INFO: 'info' - } + option_icons=Item.UNAVAIL_MODE_ICONS ) self.fields['hide_without_voucher'].widget = ButtonGroupRadioSelect( @@ -970,18 +964,12 @@ class ItemVariationForm(I18nModelForm): self.fields['available_from_mode'].widget = ButtonGroupRadioSelect( choices=self.fields['available_from_mode'].choices, - option_icons={ - Item.UNAVAIL_MODE_HIDDEN: 'eye-slash', - Item.UNAVAIL_MODE_INFO: 'info' - } + option_icons=Item.UNAVAIL_MODE_ICONS ) self.fields['available_until_mode'].widget = ButtonGroupRadioSelect( choices=self.fields['available_until_mode'].choices, - option_icons={ - Item.UNAVAIL_MODE_HIDDEN: 'eye-slash', - Item.UNAVAIL_MODE_INFO: 'info' - } + option_icons=Item.UNAVAIL_MODE_ICONS ) self.meta_fields = [] diff --git a/src/pretix/control/templates/pretixcontrol/subevents/fragment_unavail_mode_indicator.html b/src/pretix/control/templates/pretixcontrol/subevents/fragment_unavail_mode_indicator.html index 9be415651..516ee2896 100644 --- a/src/pretix/control/templates/pretixcontrol/subevents/fragment_unavail_mode_indicator.html +++ b/src/pretix/control/templates/pretixcontrol/subevents/fragment_unavail_mode_indicator.html @@ -2,5 +2,5 @@ {% if mode == "hide" %} {% else %} - + {% endif %} \ No newline at end of file