CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-09 15:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Public event filter: Make "all" option clearer (Z#23169843) (#4585)

Browse Source 
* Public event filter: Make "all" option clearer

* Fix widget tests

* Update src/tests/presale/test_widget.py

Co-authored-by: Richard Schreiber <schreiber@rami.io>

---------

Co-authored-by: Richard Schreiber <schreiber@rami.io>
This commit is contained in:
Raphael Michel
2024-10-29 17:31:51 +01:00
committed by GitHub
parent f9502a3212
commit 81d7045b31
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/presale/forms/organizer.py
View File

@@ -21,6 +21,7 @@
# #
from django import forms from django import forms
from django.conf import settings from django.conf import settings
from django.utils.translation import pgettext
from i18nfield.strings import LazyI18nString from i18nfield.strings import LazyI18nString
from pretix.base.models import EventMetaValue, SubEventMetaValue from pretix.base.models import EventMetaValue, SubEventMetaValue
@@ -66,7 +67,7 @@ def meta_filtersets(organizer, event=None):
).values_list("value", flat=True).distinct()) ).values_list("value", flat=True).distinct())
choices = [(k, k) for k in sorted(existing_values)] choices = [(k, k) for k in sorted(existing_values)]
choices.insert(0, ("", "")) choices.insert(0, ("", "-- %s --" % pgettext("filter_empty", "all")))
if len(choices) > 1: if len(choices) > 1:
fields[f"attr[{prop.name}]"] = { fields[f"attr[{prop.name}]"] = {
"label": str(prop.public_label) or prop.name, "label": str(prop.public_label) or prop.name,

6
src/tests/presale/test_widget.py
View File

@@ -812,7 +812,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
data = json.loads(response.content.decode()) data = json.loads(response.content.decode())
assert data["meta_filter_fields"] == [ assert data["meta_filter_fields"] == [
{ {
"choices": [["", ""], ["EN", "English"], ["DE", "German"]], "choices": [["", "-- all --"], ["EN", "English"], ["DE", "German"]],
"key": "attr[Language]", "key": "attr[Language]",
"label": "Language" "label": "Language"
} }
@@ -838,7 +838,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
data = json.loads(response.content.decode()) data = json.loads(response.content.decode())
assert data["meta_filter_fields"] == [ assert data["meta_filter_fields"] == [
{ {
"choices": [["", ""], ["DE", "DE"], ["EN", "EN"]], "choices": [["", "-- all --"], ["DE", "DE"], ["EN", "EN"]],
"key": "attr[Language]", "key": "attr[Language]",
"label": "Language" "label": "Language"
} }
@@ -848,7 +848,7 @@ class WidgetCartTest(CartTestMixin, TestCase):
data = json.loads(response.content.decode()) data = json.loads(response.content.decode())
assert data["meta_filter_fields"] == [ assert data["meta_filter_fields"] == [
{ {
"choices": [["", ""], ["DE", "DE"]], "choices": [["", "-- all --"], ["DE", "DE"]],
"key": "attr[Language]", "key": "attr[Language]",
"label": "Language" "label": "Language"
} }