diff --git a/src/pretix/api/serializers/item.py b/src/pretix/api/serializers/item.py index 96ba8a4fa8..053481014f 100644 --- a/src/pretix/api/serializers/item.py +++ b/src/pretix/api/serializers/item.py @@ -459,7 +459,6 @@ class ItemCategorySerializer(I18nAwareModelSerializer): return data - class QuestionOptionSerializer(I18nAwareModelSerializer): identifier = serializers.CharField(allow_null=True) diff --git a/src/pretix/base/services/cross_selling.py b/src/pretix/base/services/cross_selling.py index ff617c75de..4ca8e3b1e9 100644 --- a/src/pretix/base/services/cross_selling.py +++ b/src/pretix/base/services/cross_selling.py @@ -96,7 +96,7 @@ class CrossSellingService: match = set(match.pk for match in category.cross_selling_match_products.only('pk')) # TODO prefetch this return (category.items.all(), {}) if any(pos.item.pk in match for pos in self.cartpositions) else (None, {}) if category.cross_selling_condition == 'discounts': - my_item_pks = [item.id for item in category.items.all()] #category.items.values_list('pk', flat=True) + my_item_pks = [item.id for item in category.items.all()] potential_discount_items = { item.pk: (max_count, discount_rule) for item, max_count, discount_rule in self._potential_discounts_by_item_for_current_cart diff --git a/src/pretix/control/forms/item.py b/src/pretix/control/forms/item.py index 75634e3240..ce8dc9f7fc 100644 --- a/src/pretix/control/forms/item.py +++ b/src/pretix/control/forms/item.py @@ -40,7 +40,6 @@ from urllib.parse import urlencode from django import forms from django.conf import settings from django.core.exceptions import ValidationError -from django.core.files.uploadedfile import UploadedFile from django.db.models import Max, Q from django.forms import ChoiceField, RadioSelect from django.forms.formsets import DELETION_FIELD_NAME diff --git a/src/tests/base/test_cross_selling.py b/src/tests/base/test_cross_selling.py index 7a557d52aa..3ff774d6a4 100644 --- a/src/tests/base/test_cross_selling.py +++ b/src/tests/base/test_cross_selling.py @@ -27,10 +27,10 @@ from typing import List, Tuple import pytest from django.utils.timezone import now from django_scopes import scopes_disabled +from tests import assert_num_queries from pretix.base.models import CartPosition, Discount, Event, Organizer from pretix.base.services.cross_selling import CrossSellingService -from tests import assert_num_queries @pytest.fixture @@ -467,6 +467,7 @@ def test_five_tickets_one_free(event): ''' ) + @scopes_disabled() @pytest.mark.django_db @pytest.mark.parametrize("itemcount", [3, 10, 50])