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

FormFields: remove placeholders duplicating labels (#5135)

Browse Source
This commit is contained in:
Richard Schreiber
2025-07-10 16:06:36 +02:00
committed by GitHub
parent 415bff5c72
commit 14d6013292
17 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pretix/control/forms/event.py
View File

@@ -113,7 +113,6 @@ class EventWizardFoundationForm(forms.Form):
attrs={
'data-model-select2': 'generic',
'data-select2-url': reverse('control:organizers.select2') + '?can_create=1',
'data-placeholder': _('Organizer')
}
),
empty_label=None,

10
src/pretix/control/forms/filter.py
View File

@@ -1246,9 +1246,7 @@ class SubEventFilterForm(FilterForm):
)
query = forms.CharField(
label=_('Event name'),
widget=forms.TextInput(attrs={
'placeholder': _('Event name'),
}),
widget=forms.TextInput(),
required=False
)
@@ -1693,9 +1691,7 @@ class EventFilterForm(FilterForm):
)
query = forms.CharField(
label=_('Event name'),
widget=forms.TextInput(attrs={
'placeholder': _('Event name'),
}),
widget=forms.TextInput(),
required=False
)
date_from = forms.DateField(
@@ -2448,7 +2444,7 @@ class CheckinFilterForm(FilterForm):
'event': self.event.slug,
'organizer': self.event.organizer.slug,
}),
'data-placeholder': _('Check-in list'),
'data-placeholder': _('All check-in lists'),
}
)
self.fields['checkin_list'].widget.choices = self.fields['checkin_list'].choices

8
src/pretix/control/forms/item.py
View File

@@ -47,9 +47,7 @@ from django.urls import reverse
from django.utils.functional import cached_property
from django.utils.html import escape, format_html
from django.utils.safestring import mark_safe
from django.utils.translation import (
gettext as __, gettext_lazy as _, pgettext_lazy,
)
from django.utils.translation import gettext as __, gettext_lazy as _
from django_scopes.forms import (
SafeModelChoiceField, SafeModelMultipleChoiceField,
)
@@ -330,7 +328,6 @@ class QuotaForm(I18nModelForm):
'event': self.event.slug,
'organizer': self.event.organizer.slug,
}),
'data-placeholder': pgettext_lazy('subevent', 'Date')
}
)
self.fields['subevent'].widget.choices = self.fields['subevent'].choices
@@ -352,6 +349,9 @@ class QuotaForm(I18nModelForm):
field_classes = {
'subevent': SafeModelChoiceField,
}
widgets = {
'size': forms.NumberInput(attrs={'placeholder': _('Unlimited')})
}
def save(self, *args, **kwargs):
creating = not self.instance.pk

2
src/pretix/control/forms/orders.py
View File

@@ -409,7 +409,6 @@ class OrderPositionAddForm(forms.Form):
'event': order.event.slug,
'organizer': order.event.organizer.slug,
}),
'data-placeholder': pgettext_lazy('subevent', 'Date')
}
)
self.fields['subevent'].widget.choices = self.fields['subevent'].choices
@@ -705,7 +704,6 @@ class OrderContactForm(forms.ModelForm):
'data-select2-url': reverse('control:organizer.customers.select2', kwargs={
'organizer': self.instance.event.organizer.slug,
}),
'data-placeholder': _('Customer')
}
)
self.fields['customer'].widget.choices = self.fields['customer'].choices

4
src/pretix/control/forms/organizer.py
View File

@@ -781,7 +781,6 @@ class GiftCardUpdateForm(forms.ModelForm):
'data-select2-url': reverse('control:organizer.ticket_select2', kwargs={
'organizer': organizer.slug,
}),
'data-placeholder': _('Ticket')
}
)
self.fields['owner_ticket'].widget.choices = self.fields['owner_ticket'].choices
@@ -817,7 +816,6 @@ class ReusableMediumUpdateForm(forms.ModelForm):
'data-select2-url': reverse('control:organizer.ticket_select2', kwargs={
'organizer': organizer.slug,
}),
'data-placeholder': _('Ticket')
}
)
self.fields['linked_orderposition'].widget.choices = self.fields['linked_orderposition'].choices
@@ -830,7 +828,6 @@ class ReusableMediumUpdateForm(forms.ModelForm):
'data-select2-url': reverse('control:organizer.giftcards.select2', kwargs={
'organizer': organizer.slug,
}),
'data-placeholder': _('Gift card')
}
)
self.fields['linked_giftcard'].widget.choices = self.fields['linked_giftcard'].choices
@@ -844,7 +841,6 @@ class ReusableMediumUpdateForm(forms.ModelForm):
'data-select2-url': reverse('control:organizer.customers.select2', kwargs={
'organizer': organizer.slug,
}),
'data-placeholder': _('Customer')
}
)
self.fields['customer'].widget.choices = self.fields['customer'].choices

4
src/pretix/control/forms/subevents.py
View File

@@ -133,16 +133,12 @@ class SubEventBulkEditForm(I18nModelForm):
# i18n fields
if k in self.mixed_values:
self.fields[k].widget.attrs['placeholder'] = '[{}]'.format(_('Selection contains various values'))
else:
self.fields[k].widget.attrs['placeholder'] = ''
self.fields[k].one_required = False
for k in ('geo_lat', 'geo_lon', 'comment'):
# scalar fields
if k in self.mixed_values:
self.fields[k].widget.attrs['placeholder'] = '[{}]'.format(_('Selection contains various values'))
else:
self.fields[k].widget.attrs['placeholder'] = ''
self.fields[k].widget.is_required = False
self.fields[k].required = False

3
src/pretix/control/forms/vouchers.py
View File

@@ -41,7 +41,7 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.core.validators import EmailValidator
from django.db.models.functions import Upper
from django.urls import reverse
from django.utils.translation import gettext_lazy as _, pgettext_lazy
from django.utils.translation import gettext_lazy as _
from django_scopes.forms import SafeModelChoiceField
from pretix.base.email import get_available_placeholders
@@ -115,7 +115,6 @@ class VoucherForm(I18nModelForm):
'event': instance.event.slug,
'organizer': instance.event.organizer.slug,
}),
'data-placeholder': pgettext_lazy('subevent', 'Date')
}
)
self.fields['subevent'].widget.choices = self.fields['subevent'].choices