From f26d2604713527d758080787eea78901cca4d4bd Mon Sep 17 00:00:00 2001
From: Lukas Bockstaller <bockstaller@pretix.eu>
Date: Tue, 16 Dec 2025 12:50:49 +0100
Subject: [PATCH] make name and phone field optional by removing them

---
 src/pretix/control/forms/waitinglist.py       | 22 ++++++++++---------
 .../pretixcontrol/waitinglist/edit.html       |  6 +++--
 src/pretix/control/views/waitinglist.py       |  2 --
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/pretix/control/forms/waitinglist.py b/src/pretix/control/forms/waitinglist.py
index 4eedc5e032..e5af40d61f 100644
--- a/src/pretix/control/forms/waitinglist.py
+++ b/src/pretix/control/forms/waitinglist.py
@@ -81,17 +81,19 @@ class WaitingListEntryEditForm(I18nModelForm):
         # the value for item is derived and populated during form.clean()
         self.fields['item'].required = False
 
-        self.fields['name_parts'] = NamePartsFormField(
-            max_length=255,
-            required=True,
-            scheme=self.event.organizer.settings.name_scheme,
-            titles=self.event.organizer.settings.name_scheme_titles,
-            label=_('Name'),
-        )
+        if self.event.settings.waiting_list_names_asked:
+            self.fields['name_parts'] = NamePartsFormField(
+                max_length=255,
+                required=self.event.settings.waiting_list_names_required,
+                scheme=self.event.organizer.settings.name_scheme,
+                titles=self.event.organizer.settings.name_scheme_titles,
+                label=_('Name'),
+            )
+        else:
+            del self.fields['name_parts']
 
-        self.fields['name_parts'].required = self.event.settings.waiting_list_names_required
-        self.fields['name_parts'].one_required = self.event.settings.waiting_list_names_required
-        self.fields['phone'].required = self.event.settings.waiting_list_phones_required
+        if not self.event.settings.waiting_list_names_asked:
+            del self.fields['phone']
 
         choices = []
 
diff --git a/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html b/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html
index 219296d731..889ec67b6a 100644
--- a/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html
+++ b/src/pretix/control/templates/pretixcontrol/waitinglist/edit.html
@@ -8,10 +8,12 @@
         {% csrf_token %}
 
         {% bootstrap_field form.email layout="control" %}
-        {% if names_asked %}
+
+        {% if form.phone %}
             {% bootstrap_field form.name_parts layout="control" %}
         {% endif %}
-        {% if phones_asked %}
+
+        {% if form.phone %}
             {% bootstrap_field form.phone layout="control" %}
         {% endif %}
         {% bootstrap_field form.itemvar layout="control" %}
diff --git a/src/pretix/control/views/waitinglist.py b/src/pretix/control/views/waitinglist.py
index 950979c180..206399e1ce 100644
--- a/src/pretix/control/views/waitinglist.py
+++ b/src/pretix/control/views/waitinglist.py
@@ -414,8 +414,6 @@ class EntryEdit(EventPermissionRequiredMixin, UpdateView):
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx['names_asked'] = self.request.event.settings.waiting_list_names_asked
-        ctx['phones_asked'] = self.request.event.settings.waiting_list_phones_asked
         return ctx
 
     @transaction.atomic