From 7c21aed1a751c460792c36116f2331c9e6530984 Mon Sep 17 00:00:00 2001
From: Lukas Bockstaller <bockstaller@pretix.eu>
Date: Tue, 16 Dec 2025 12:51:36 +0100
Subject: [PATCH] remove item and variation fields from form

rather set those values during clean
---
 src/pretix/control/forms/waitinglist.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/pretix/control/forms/waitinglist.py b/src/pretix/control/forms/waitinglist.py
index e5af40d61f..e1a14b9c62 100644
--- a/src/pretix/control/forms/waitinglist.py
+++ b/src/pretix/control/forms/waitinglist.py
@@ -79,7 +79,6 @@ class WaitingListEntryEditForm(I18nModelForm):
 
         # Prevent the item field cleaning from complaining that it isn't populated
         # the value for item is derived and populated during form.clean()
-        self.fields['item'].required = False
 
         if self.event.settings.waiting_list_names_asked:
             self.fields['name_parts'] = NamePartsFormField(
@@ -125,16 +124,17 @@ class WaitingListEntryEditForm(I18nModelForm):
         self.fields['itemvar'].choices = choices
 
     def clean(self):
-        cleaned_data = super().clean()
-        itemvar = cleaned_data.get('itemvar')
+        itemvar = self.data.get('itemvar')
+
         if itemvar is None:
             self.add_error('itemvar', _('Item and Variation are required'))
-            return cleaned_data
+        else:
+            self.instance.item = Item.objects.get(pk=itemvar.split('-')[0])
+            if '-' in itemvar:
+                self.instance.variation = ItemVariation.objects.get(pk=itemvar.split('-')[1])
 
-        cleaned_data['item'] = Item.objects.get(pk=itemvar.split('-')[0])
-        if '-' in itemvar:
-            cleaned_data['variation'] = ItemVariation.objects.get(pk=itemvar.split('-')[1])
-        return cleaned_data
+        data = super().clean()
+        return data
 
     class Meta:
         model = WaitingListEntry
@@ -142,14 +142,10 @@ class WaitingListEntryEditForm(I18nModelForm):
             'email',
             'name_parts',
             'phone',
-            'item',
-            'variation',
         ]
         field_classes = {
             'email': EmailField,
             'phone': PhoneNumberField,
-            'item': SafeModelChoiceField,
-            'variation': SafeModelChoiceField,
         }
         exclude = [
             'subevent',  # handled by EntryTransfer view