From 6f980b82ac1c03c9030de99d05a2d51c59ad49c3 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 31 Jan 2019 18:44:12 +0100 Subject: [PATCH] Sort exporters by name alphabetically --- src/pretix/base/exporters/json.py | 2 +- src/pretix/base/exporters/orderlist.py | 4 ++-- src/pretix/control/views/orders.py | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pretix/base/exporters/json.py b/src/pretix/base/exporters/json.py index c7623b65d..a6163e224 100644 --- a/src/pretix/base/exporters/json.py +++ b/src/pretix/base/exporters/json.py @@ -10,7 +10,7 @@ from ..signals import register_data_exporters class JSONExporter(BaseExporter): identifier = 'json' - verbose_name = 'JSON' + verbose_name = 'Order data (JSON)' def render(self, form_data): jo = { diff --git a/src/pretix/base/exporters/orderlist.py b/src/pretix/base/exporters/orderlist.py index 0044776c2..3e483cfca 100644 --- a/src/pretix/base/exporters/orderlist.py +++ b/src/pretix/base/exporters/orderlist.py @@ -18,7 +18,7 @@ from ..signals import register_data_exporters class OrderListExporter(ListExporter): identifier = 'orderlist' - verbose_name = ugettext_lazy('List of orders') + verbose_name = ugettext_lazy('Order data') @property def additional_form_fields(self): @@ -166,7 +166,7 @@ class OrderListExporter(ListExporter): class PaymentListExporter(ListExporter): identifier = 'paymentlist' - verbose_name = ugettext_lazy('List of payments and refunds') + verbose_name = ugettext_lazy('Order payments and refunds') @property def additional_form_fields(self): diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index c17cc14db..26e560739 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -1581,8 +1581,7 @@ class ExportMixin: def exporters(self): exporters = [] responses = register_data_exporters.send(self.request.event) - for receiver, response in responses: - ex = response(self.request.event) + for ex in sorted([response(self.request.event) for r, response in responses], key=lambda ex: str(ex.verbose_name)): if self.request.GET.get("identifier") and ex.identifier != self.request.GET.get("identifier"): continue