Allow dependent questions to depend on multiple values (#1336)

src/pretix/control/forms/item.py

@@ -55,8 +55,13 @@ class QuestionForm(I18nModelForm):
                 pk=self.instance.pk
             )
         self.fields['identifier'].required = False
+        self.fields['dependency_values'].required = False
         self.fields['help_text'].widget.attrs['rows'] = 3
 
+    def clean_dependency_values(self):
+        val = self.data.getlist('dependency_values')
+        return val
+
     def clean_dependency_question(self):
         dep = val = self.cleaned_data.get('dependency_question')
         if dep:
@@ -70,8 +75,8 @@ class QuestionForm(I18nModelForm):
 
     def clean(self):
         d = super().clean()
-        if d.get('dependency_question') and not d.get('dependency_value'):
-            raise ValidationError({'dependency_value': [_('This field is required')]})
+        if d.get('dependency_question') and not d.get('dependency_values'):
+            raise ValidationError({'dependency_values': [_('This field is required')]})
         if d.get('dependency_question') and d.get('ask_during_checkin'):
             raise ValidationError(_('Dependencies between questions are not supported during check-in.'))
         return d
@@ -89,13 +94,13 @@ class QuestionForm(I18nModelForm):
             'identifier',
             'items',
             'dependency_question',
-            'dependency_value'
+            'dependency_values'
         ]
         widgets = {
             'items': forms.CheckboxSelectMultiple(
                 attrs={'class': 'scrolling-multiple-choice'}
             ),
-            'dependency_value': forms.Select,
+            'dependency_values': forms.SelectMultiple,
         }
         field_classes = {
             'items': SafeModelMultipleChoiceField,

src/pretix/control/templates/pretixcontrol/items/question_edit.html

@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% load formset_tags %}
+{% load escapejson %}
 {% block title %}
     {% if question %}
         {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}
@@ -120,8 +121,8 @@
                     {% bootstrap_field form.dependency_question layout="inline" form_group_class="inner" %}
                 </div>
                 <div class="col-md-5">
-                    <script type="text/plain" id="dependency_value_val">{{ form.instance.dependency_value }}</script>
-                    {% bootstrap_field form.dependency_value layout="inline" form_group_class="inner" %}
+                    <script type="text/plain" id="dependency_value_val">{{ form.instance.dependency_values|escapejson_dumps }}</script>
+                    {% bootstrap_field form.dependency_values layout="inline" form_group_class="inner" %}
                 </div>
             </div>
         </fieldset>

src/pretix/control/templates/pretixcontrol/items/quota_delete.html

@@ -32,7 +32,7 @@
                 </a>
             </div>
         {% endif %}
-        <div class="form-group submit-group">
+		<div class="form-group submit-group">
             <a href="{% url "control:event.items.quotas" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
                 {% trans "Cancel" %}
             </a>