diff --git a/src/pretix/control/templates/pretixcontrol/attendees/index.html b/src/pretix/control/templates/pretixcontrol/attendees/index.html index b4854ba88..f6b888db5 100644 --- a/src/pretix/control/templates/pretixcontrol/attendees/index.html +++ b/src/pretix/control/templates/pretixcontrol/attendees/index.html @@ -4,7 +4,7 @@ {% block title %}{% trans "Attendees" %}{% endblock %} {% block content %}

{% trans "Attendees" %}

- {% if attendees|length == 0 %} + {% if not filtered and attendees|length == 0 %}

{% blocktrans trimmed %} diff --git a/src/pretix/control/templates/pretixcontrol/orders/index.html b/src/pretix/control/templates/pretixcontrol/orders/index.html index cc300d66f..aaba2ae3d 100644 --- a/src/pretix/control/templates/pretixcontrol/orders/index.html +++ b/src/pretix/control/templates/pretixcontrol/orders/index.html @@ -4,7 +4,7 @@ {% block title %}{% trans "Orders" %}{% endblock %} {% block content %}

{% trans "Orders" %}

- {% if questions|length == 0 %} + {% if not filtered and orders|length == 0 %}

{% blocktrans trimmed %} diff --git a/src/pretix/control/views/attendees.py b/src/pretix/control/views/attendees.py index 3330eeb9f..1f653de12 100644 --- a/src/pretix/control/views/attendees.py +++ b/src/pretix/control/views/attendees.py @@ -27,4 +27,5 @@ class AttendeeList(EventPermissionRequiredMixin, ListView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) ctx['items'] = Item.objects.filter(event=self.request.event, admission=True) + ctx['filtered'] = ("status" in self.request.GET or "item" in self.request.GET) return ctx diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index 356c4fb3e..266f81c04 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -58,6 +58,7 @@ class OrderList(EventPermissionRequiredMixin, ListView): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) ctx['items'] = Item.objects.filter(event=self.request.event) + ctx['filtered'] = ("status" in self.request.GET or "item" in self.request.GET or "user" in self.request.GET) return ctx diff --git a/src/tests/control/test_items.py b/src/tests/control/test_items.py index e24135a53..1f0613aea 100644 --- a/src/tests/control/test_items.py +++ b/src/tests/control/test_items.py @@ -100,7 +100,7 @@ class CategoriesTest(ItemFormTest): )) self.driver.find_element_by_class_name("btn-danger").click() self.driver.find_element_by_class_name("alert-success") - self.assertNotIn("Entry tickets", self.driver.find_element_by_css_selector("#page-wrapper table").text) + self.assertNotIn("Entry tickets", self.driver.find_element_by_css_selector("#page-wrapper").text) assert not ItemCategory.objects.filter(id=c.id).exists() @@ -138,7 +138,7 @@ class QuestionsTest(ItemFormTest): )) self.driver.find_element_by_class_name("btn-danger").click() self.driver.find_element_by_class_name("alert-success") - self.assertNotIn("shoe size", self.driver.find_element_by_css_selector("#page-wrapper table").text) + self.assertNotIn("shoe size", self.driver.find_element_by_css_selector("#page-wrapper").text) assert not Question.objects.filter(id=c.id).exists() @@ -186,5 +186,5 @@ class QuotaTest(ItemFormTest): )) self.driver.find_element_by_class_name("btn-danger").click() self.driver.find_element_by_class_name("alert-success") - self.assertNotIn("Full house", self.driver.find_element_by_css_selector("#page-wrapper table").text) + self.assertNotIn("Full house", self.driver.find_element_by_css_selector("#page-wrapper").text) assert not Quota.objects.filter(id=c.id).exists()