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

use correct choice format

Browse Source
This commit is contained in:
Lukas Bockstaller
2026-05-28 13:41:57 +02:00
parent b0a34fa196
commit 0472101c81
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pretix/base/reldate.py
View File

@@ -359,7 +359,8 @@ class RelativeDateTimeWidget(forms.MultiWidget):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.status_choices = kwargs.pop('status_choices') self.status_choices = kwargs.pop('status_choices')
self.base_choices = kwargs.pop('base_choices') base_choices = kwargs.pop('base_choices')
choices = _get_choices(base_choices)
def placeholder_datetime_format(): def placeholder_datetime_format():
df = get_format('DATETIME_INPUT_FORMATS')[0] df = get_format('DATETIME_INPUT_FORMATS')[0]
@@ -379,8 +380,8 @@ class RelativeDateTimeWidget(forms.MultiWidget):
rel_days_number=forms.NumberInput(), rel_days_number=forms.NumberInput(),
rel_mins_relationto=OptionAttrsSelect( rel_mins_relationto=OptionAttrsSelect(
attrs={'data-relative-choice': True}, attrs={'data-relative-choice': True},
choices=self.base_choices, choices=choices,
option_attrs=_get_choice_validation_obj(self.base_choices) option_attrs=_get_choice_validation_obj(base_choices)
), ),
rel_days_timeofday=forms.TimeInput( rel_days_timeofday=forms.TimeInput(
attrs={'placeholder': lazy(placeholder_time_format, str), 'class': 'timepickerfield'} attrs={'placeholder': lazy(placeholder_time_format, str), 'class': 'timepickerfield'}
@@ -388,8 +389,8 @@ class RelativeDateTimeWidget(forms.MultiWidget):
rel_mins_number=forms.NumberInput(), rel_mins_number=forms.NumberInput(),
rel_days_relationto=OptionAttrsSelect( rel_days_relationto=OptionAttrsSelect(
attrs={'data-relative-choice': True}, attrs={'data-relative-choice': True},
choices=self.base_choices, choices=choices,
option_attrs=_get_choice_validation_obj(self.base_choices) option_attrs=_get_choice_validation_obj(base_choices)
), ),
rel_mins_relation=forms.Select(attrs={'data-relation-choice': True}, choices=BEFORE_AFTER_CHOICE), rel_mins_relation=forms.Select(attrs={'data-relation-choice': True}, choices=BEFORE_AFTER_CHOICE),
rel_days_relation=forms.Select(attrs={'data-relation-choice': True}, choices=BEFORE_AFTER_CHOICE), rel_days_relation=forms.Select(attrs={'data-relation-choice': True}, choices=BEFORE_AFTER_CHOICE),
@@ -458,8 +459,6 @@ class RelativeDateTimeWidget(forms.MultiWidget):
for w in ctx['widget']['subwidgets'] for w in ctx['widget']['subwidgets']
))._asdict() ))._asdict()
ctx['choice_validation'] = _get_choice_validation_obj(self.base_choices)
ctx['choice_validation_name'] = f'{name}_val'
return ctx return ctx
@@ -674,13 +673,6 @@ class RelativeDateWidget(RelativeDateTimeWidget):
rel_days_relation="after" if value.data.is_after else "before" rel_days_relation="after" if value.data.is_after else "before"
) )
def get_context(self, name, value, attrs):
ctx = super().get_context(name, value, attrs)
ctx['choice_validation'] = _get_choice_validation_obj(self.base_choices)
ctx['choice_validation_name'] = f'{name}_val'
return ctx
class RelativeDateField(RelativeDateTimeField): class RelativeDateField(RelativeDateTimeField):