From 0785ca049f20af8b6c4334ff8de829d4d5d5def8 Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Wed, 16 Sep 2026 15:09:51 +0200 Subject: [PATCH] rename some instances of Question -> Datafield --- src/pretix/api/serializers/item.py | 2 +- src/pretix/api/serializers/order.py | 4 ++-- src/pretix/api/urls.py | 2 +- src/pretix/api/views/checkin.py | 4 ++-- src/pretix/api/views/item.py | 6 +++--- .../templates/pretixcontrol/items/question_edit.html | 2 +- src/pretix/control/urls.py | 1 - 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/pretix/api/serializers/item.py b/src/pretix/api/serializers/item.py index 76cfb0998c..9658d13389 100644 --- a/src/pretix/api/serializers/item.py +++ b/src/pretix/api/serializers/item.py @@ -540,7 +540,7 @@ class LegacyDependencyValueField(serializers.CharField): return [data] if data else [] -class QuestionSerializer(I18nAwareModelSerializer): +class DatafieldSerializer(I18nAwareModelSerializer): options = InlineQuestionOptionSerializer(many=True, required=False) identifier = serializers.CharField(allow_null=True) internal_name = serializers.CharField(allow_null=True, source='question', read_only=True) diff --git a/src/pretix/api/serializers/order.py b/src/pretix/api/serializers/order.py index 418dbc00f9..2958d80c94 100644 --- a/src/pretix/api/serializers/order.py +++ b/src/pretix/api/serializers/order.py @@ -46,7 +46,7 @@ from pretix.api.serializers.event import SubEventSerializer from pretix.api.serializers.forms import form_field_to_serializer_field from pretix.api.serializers.i18n import I18nAwareModelSerializer from pretix.api.serializers.item import ( - InlineItemVariationSerializer, ItemSerializer, QuestionSerializer, + InlineItemVariationSerializer, ItemSerializer, DatafieldSerializer, ) from pretix.api.signals import order_api_details, orderposition_api_details from pretix.base.decimal import round_decimal @@ -715,7 +715,7 @@ class CheckinListOrderPositionSerializer(OrderPositionSerializer): self.fields['variation'] = InlineItemVariationSerializer(read_only=True, context=self.context) if 'answers.question' in self.context['expand']: - self.fields['answers'].child.fields['question'] = QuestionSerializer(read_only=True) + self.fields['answers'].child.fields['question'] = DatafieldSerializer(read_only=True) # TODO(questionnaires) if 'addons' in self.context['expand']: # Experimental feature, undocumented on purpose for now in case we need to remove it again diff --git a/src/pretix/api/urls.py b/src/pretix/api/urls.py index 6cd73c3bf8..f7e5ee640c 100644 --- a/src/pretix/api/urls.py +++ b/src/pretix/api/urls.py @@ -79,7 +79,7 @@ event_router.register(r'subevents', event.SubEventViewSet) event_router.register(r'clone', event.CloneEventViewSet) event_router.register(r'items', item.ItemViewSet) event_router.register(r'categories', item.ItemCategoryViewSet) -event_router.register(r'datafields', item.QuestionViewSet) +event_router.register(r'datafields', item.DatafieldViewSet) event_router.register(r'questionnaires', item.QuestionnaireViewSet) event_router.register(r'discounts', discount.DiscountViewSet) event_router.register(r'quotas', item.QuotaViewSet) diff --git a/src/pretix/api/views/checkin.py b/src/pretix/api/views/checkin.py index 87477dd82c..55357f4001 100644 --- a/src/pretix/api/views/checkin.py +++ b/src/pretix/api/views/checkin.py @@ -54,7 +54,7 @@ from pretix.api.serializers.checkin import ( CheckinListSerializer, CheckinRPCAnnulInputSerializer, CheckinRPCRedeemInputSerializer, MiniCheckinListSerializer, ) -from pretix.api.serializers.item import QuestionSerializer +from pretix.api.serializers.item import DatafieldSerializer from pretix.api.serializers.order import ( CheckinListOrderPositionSerializer, CheckinSerializer, FailedCheckinSerializer, @@ -866,7 +866,7 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force, 'checkin_texts': op.checkin_texts, 'position': CheckinListOrderPositionSerializer(op, context=_make_context(context, op.order.event)).data, 'questions': [ - QuestionSerializer(q).data for q in e.questions + DatafieldSerializer(q).data for q in e.questions # TODO(questionnaires) ], 'list': MiniCheckinListSerializer(list_by_event[op.order.event_id]).data, }, status=400) diff --git a/src/pretix/api/views/item.py b/src/pretix/api/views/item.py index a051780be8..2a1221d39d 100644 --- a/src/pretix/api/views/item.py +++ b/src/pretix/api/views/item.py @@ -48,7 +48,7 @@ from pretix.api.pagination import TotalOrderingFilter from pretix.api.serializers.item import ( ItemAddOnSerializer, ItemBundleSerializer, ItemCategorySerializer, ItemProgramTimeSerializer, ItemSerializer, ItemVariationSerializer, - QuestionnaireSerializer, QuestionOptionSerializer, QuestionSerializer, + QuestionnaireSerializer, QuestionOptionSerializer, DatafieldSerializer, QuotaSerializer, ) from pretix.api.views import ConditionalListView @@ -466,8 +466,8 @@ with scopes_disabled(): fields = ['ask_during_checkin', 'required', 'identifier'] -class QuestionViewSet(ConditionalListView, viewsets.ModelViewSet): - serializer_class = QuestionSerializer +class DatafieldViewSet(ConditionalListView, viewsets.ModelViewSet): + serializer_class = DatafieldSerializer queryset = Question.objects.none() filter_backends = (DjangoFilterBackend, TotalOrderingFilter) filterset_class = QuestionFilter diff --git a/src/pretix/control/templates/pretixcontrol/items/question_edit.html b/src/pretix/control/templates/pretixcontrol/items/question_edit.html index 596366176f..dfe51714a3 100644 --- a/src/pretix/control/templates/pretixcontrol/items/question_edit.html +++ b/src/pretix/control/templates/pretixcontrol/items/question_edit.html @@ -5,7 +5,7 @@ {% load escapejson %} {% block title %} {% if question %} - {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %} + {% blocktrans with name=question.question %}Data field: {{ name }}{% endblocktrans %} {% else %} {% trans "Question" %} {% endif %} diff --git a/src/pretix/control/urls.py b/src/pretix/control/urls.py index 706e2bfe32..1b41cd6872 100644 --- a/src/pretix/control/urls.py +++ b/src/pretix/control/urls.py @@ -342,7 +342,6 @@ urlpatterns = [ name='event.items.categories.edit'), re_path(r'^categories/add$', item.CategoryCreate.as_view(), name='event.items.categories.add'), re_path(r'^questions/$', item.QuestionList.as_view(), name='event.items.questions'), - re_path(r'^questions/reorder$', item.reorder_questions, name='event.items.questions.reorder'), re_path(r'^questions/(?P\d+)/delete$', item.QuestionDelete.as_view(), name='event.items.questions.delete'), re_path(r'^questions/(?P\d+)/$', item.QuestionView.as_view(),