From b2cc8294e4d848435a6e82d7ca52e15077d0d66a Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Tue, 1 Jul 2025 15:34:12 +0200 Subject: [PATCH] switch to core question type labels instead of defining our own strings --- src/pretix/base/datasync/sourcefields.py | 16 ---------------- src/pretix/control/forms/mapping.py | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/pretix/base/datasync/sourcefields.py b/src/pretix/base/datasync/sourcefields.py index d55cb71243..e515127834 100644 --- a/src/pretix/base/datasync/sourcefields.py +++ b/src/pretix/base/datasync/sourcefields.py @@ -529,19 +529,3 @@ def get_enum_opts(q): return [(opt.identifier, opt.answer) for opt in q.options.all()] else: return None - - -QUESTION_TYPE_IDENTIFIERS = { - Question.TYPE_NUMBER: "NUMBER", - Question.TYPE_STRING: "STRING", - Question.TYPE_TEXT: "TEXT", - Question.TYPE_BOOLEAN: "BOOLEAN", - Question.TYPE_CHOICE: "CHOICE", - Question.TYPE_CHOICE_MULTIPLE: "CHOICE_MULTIPLE", - Question.TYPE_FILE: "FILE", - Question.TYPE_DATE: "DATE", - Question.TYPE_TIME: "TIME", - Question.TYPE_DATETIME: "DATETIME", - Question.TYPE_COUNTRYCODE: "COUNTRYCODE", - Question.TYPE_PHONENUMBER: "PHONENUMBER", -} diff --git a/src/pretix/control/forms/mapping.py b/src/pretix/control/forms/mapping.py index 08b1f9d93b..932193f96b 100644 --- a/src/pretix/control/forms/mapping.py +++ b/src/pretix/control/forms/mapping.py @@ -25,7 +25,7 @@ from django import forms from django.forms import formset_factory from django.utils.translation import gettext_lazy as _ -from pretix.base.datasync.sourcefields import QUESTION_TYPE_IDENTIFIERS +from pretix.base.models import Question from pretix.base.models.datasync import ( MODE_APPEND_LIST, MODE_OVERWRITE, MODE_SET_IF_EMPTY, MODE_SET_IF_NEW, ) @@ -118,7 +118,7 @@ class PropertyMappingFormSet(formset_factory( def pretix_fields_choices(pretix_fields, initial_choice): return [ - (f.key, f.label + " [" + QUESTION_TYPE_IDENTIFIERS[f.type] + "]") + (f.key, f.label + " [" + Question.TYPE_CHOICES[f.type] + "]") for f in pretix_fields if not f.deprecated or f.key == initial_choice ]