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

src/pretix/base/forms/questions.py

@@ -1,4 +1,5 @@
 import copy
+import json
 import logging
 from decimal import Decimal
 from urllib.error import HTTPError
@@ -10,6 +11,7 @@ import vat_moss.id
 from django import forms
 from django.contrib import messages
 from django.core.exceptions import ValidationError
+from django.db.models import QuerySet
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language, ugettext_lazy as _
@@ -25,6 +27,7 @@ from pretix.base.models.tax import EU_COUNTRIES
 from pretix.base.settings import PERSON_NAME_SCHEMES
 from pretix.base.templatetags.rich_text import rich_text
 from pretix.control.forms import SplitDateTimeField
+from pretix.helpers.escapejson import escapejson_attr
 from pretix.helpers.i18n import get_format_without_seconds
 from pretix.presale.signals import question_form_fields
 
@@ -278,7 +281,7 @@ class BaseQuestionsForm(forms.Form):
 
             if q.dependency_question_id:
                 field.widget.attrs['data-question-dependency'] = q.dependency_question_id
-                field.widget.attrs['data-question-dependency-value'] = q.dependency_value
+                field.widget.attrs['data-question-dependency-values'] = escapejson_attr(json.dumps(q.dependency_values))
                 if q.type != 'M':
                     field.widget.attrs['required'] = q.required and not self.all_optional
                     field._required = q.required and not self.all_optional
@@ -299,26 +302,24 @@ class BaseQuestionsForm(forms.Form):
 
         question_cache = {f.question.pk: f.question for f in self.fields.values() if getattr(f, 'question', None)}
 
-        def question_is_visible(parentid, qval):
+        def question_is_visible(parentid, qvals):
             parentq = question_cache[parentid]
-            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_value):
+            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
                 return False
             if 'question_%d' % parentid not in d:
                 return False
             dval = d.get('question_%d' % parentid)
-            if qval == 'True':
-                return dval
-            elif qval == 'False':
-                return not dval
-            elif isinstance(dval, QuestionOption):
-                return dval.identifier == qval
-            else:
-                return qval in [o.identifier for o in dval]
+            return (
+                ('True' in qvals and dval)
+                or ('False' in qvals and not dval)
+                or (isinstance(dval, QuestionOption) and dval.identifier in qvals)
+                or (isinstance(dval, (list, QuerySet)) and any(qval in [o.identifier for o in dval] for qval in qvals))
+            )
 
         def question_is_required(q):
             return (
                 q.required and
-                (not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_value))
+                (not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_values))
             )
 
         if not self.all_optional:

src/pretix/base/migrations/0127_auto_20190711_0705.py

@@ -0,0 +1,25 @@
+# Generated by Django 2.2.1 on 2019-07-11 07:05
+
+from django.db import migrations
+
+import pretix.base.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0126_item_show_quota_left'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='question',
+            old_name='dependency_value',
+            new_name='dependency_values',
+        ),
+        migrations.AlterField(
+            model_name='question',
+            name='dependency_values',
+            field=pretix.base.models.fields.MultiStringField(default=['']),
+        ),
+    ]

src/pretix/base/models/items.py

@@ -22,6 +22,7 @@ from i18nfield.fields import I18nCharField, I18nTextField
 
 from pretix.base.models import fields
 from pretix.base.models.base import LoggedModel
+from pretix.base.models.fields import MultiStringField
 from pretix.base.models.tax import TaxedPrice
 from pretix.base.signals import quota_availability
 
@@ -934,8 +935,8 @@ class Question(LoggedModel):
     :type identifier: str
     :param dependency_question: This question will only show up if the referenced question is set to `dependency_value`.
     :type dependency_question: Question
-    :param dependency_value: The value that `dependency_question` needs to be set to for this question to be applicable.
-    :type dependency_value: str
+    :param dependency_values: The values that `dependency_question` needs to be set to for this question to be applicable.
+    :type dependency_values: list[str]
     """
     TYPE_NUMBER = "N"
     TYPE_STRING = "S"
@@ -1015,7 +1016,7 @@ class Question(LoggedModel):
     dependency_question = models.ForeignKey(
         'Question', null=True, blank=True, on_delete=models.SET_NULL, related_name='dependent_questions'
     )
-    dependency_value = models.TextField(null=True, blank=True)
+    dependency_values = MultiStringField(default=[])
 
     objects = ScopedManager(organizer='event__organizer')
 

src/pretix/base/models/orders.py

@@ -1038,18 +1038,17 @@ class AbstractPosition(models.Model):
             q.pk: q for q in questions
         }
 
-        def question_is_visible(parentid, qval):
+        def question_is_visible(parentid, qvals):
             parentq = question_cache[parentid]
-            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_value):
+            if parentq.dependency_question_id and not question_is_visible(parentq.dependency_question_id, parentq.dependency_values):
                 return False
             if parentid not in self.answ:
                 return False
-            if qval == 'True':
-                return self.answ[parentid].answer == 'True'
-            elif qval == 'False':
-                return self.answ[parentid].answer == 'False'
-            else:
-                return qval in [o.identifier for o in self.answ[parentid].options.all()]
+            return (
+                ('True' in qvals and self.answ[parentid].answer == 'True')
+                or ('False' in qvals and self.answ[parentid].answer == 'False')
+                or (any(qval in [o.identifier for o in self.answ[parentid].options.all()] for qval in qvals))
+            )
 
         self.questions = []
         for q in questions:
@@ -1058,7 +1057,7 @@ class AbstractPosition(models.Model):
                 q.answer.question = q  # cache object
             else:
                 q.answer = ""
-            if not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_value):
+            if not q.dependency_question_id or question_is_visible(q.dependency_question_id, q.dependency_values):
                 self.questions.append(q)
 
     @property

src/pretix/base/templatetags/escapejson.py

@@ -1,3 +1,5 @@
+import json
+
 from django import template
 from django.template.defaultfilters import stringfilter
 
@@ -11,3 +13,9 @@ register = template.Library()
 def escapejs_filter(value):
     """Hex encodes characters for use in a application/json type script."""
     return escapejson(value)
+
+
+@register.filter("escapejson_dumps")
+def escapejs_dumps_filter(value):
+    """Hex encodes characters for use in a application/json type script."""
+    return escapejson(json.dumps(value))