diff --git a/src/pretix/control/templates/pretixcontrol/event/base.html b/src/pretix/control/templates/pretixcontrol/event/base.html index 244e38bee7..8aa40241a2 100644 --- a/src/pretix/control/templates/pretixcontrol/event/base.html +++ b/src/pretix/control/templates/pretixcontrol/event/base.html @@ -86,12 +86,6 @@ -
  • - - - {% trans "Attendees" %} - -
  • {% endif %} {% if request.eventperm.can_view_vouchers %}
  • diff --git a/src/pretix/control/urls.py b/src/pretix/control/urls.py index 989ff70c98..7adc2b6e08 100644 --- a/src/pretix/control/urls.py +++ b/src/pretix/control/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import include, url from pretix.control.views import ( - attendees, auth, dashboards, event, help, item, main, orders, organizer, + auth, dashboards, event, help, item, main, orders, organizer, user, vouchers, ) @@ -114,7 +114,6 @@ urlpatterns = [ url(r'^orders/export/$', orders.ExportView.as_view(), name='event.orders.export'), url(r'^orders/go$', orders.OrderGo.as_view(), name='event.orders.go'), url(r'^orders/$', orders.OrderList.as_view(), name='event.orders'), - url(r'^attendees/$', attendees.AttendeeList.as_view(), name='event.attendees'), ])), url(r'^help/(?P[a-zA-Z0-9_/]+)$', help.HelpView.as_view(), name='help'), ] diff --git a/src/pretix/control/views/attendees.py b/src/pretix/control/views/attendees.py deleted file mode 100644 index 1f653de123..0000000000 --- a/src/pretix/control/views/attendees.py +++ /dev/null @@ -1,31 +0,0 @@ -from django.views.generic import ListView - -from pretix.base.models import Item, OrderPosition -from pretix.control.permissions import EventPermissionRequiredMixin - - -class AttendeeList(EventPermissionRequiredMixin, ListView): - model = OrderPosition - context_object_name = 'attendees' - template_name = 'pretixcontrol/attendees/index.html' - paginate_by = 30 - permission = 'can_view_orders' - - def get_queryset(self): - qs = OrderPosition.objects.filter( - order__event=self.request.event, - item__admission=True - ).select_related('order') - if self.request.GET.get("status", "") != "": - s = self.request.GET.get("status", "") - qs = qs.filter(order__status=s) - if self.request.GET.get("item", "") != "": - i = self.request.GET.get("item", "") - qs = qs.filter(item_id__in=(i,)).distinct() - return qs - - 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/tests/control/test_permissions.py b/src/tests/control/test_permissions.py index ebcb552c46..42f3697378 100644 --- a/src/tests/control/test_permissions.py +++ b/src/tests/control/test_permissions.py @@ -70,7 +70,6 @@ event_urls = [ "orders/ABC/download/pdf", "orders/ABC/", "orders/", - "attendees/", "invoice/1", ] @@ -144,7 +143,6 @@ event_permission_urls = [ ("can_change_items", "quotas/add", 200), ("can_view_orders", "orders/overview/", 200), ("can_view_orders", "orders/", 200), - ("can_view_orders", "attendees/", 200), ("can_view_orders", "orders/FOO/", 200), ("can_change_orders", "orders/FOO/extend", 200), ("can_change_orders", "orders/FOO/contact", 200),