From 968ecb009d15edfcb1cd443535c26bcbe00788c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 22 Mar 2017 10:05:08 +0100 Subject: [PATCH] backoffice: invert sort order, from new to old ones (#15545) --- tests/test_backoffice_pages.py | 8 ++++---- wcs/backoffice/management.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/test_backoffice_pages.py b/tests/test_backoffice_pages.py index bc3c2391..43efc97e 100644 --- a/tests/test_backoffice_pages.py +++ b/tests/test_backoffice_pages.py @@ -397,7 +397,7 @@ def test_backoffice_listing_order(pub): formdata.evolution[-1].time = datetime.datetime(2015, 2, 1, 10 + i % 2, i).timetuple() formdata.store() - receipt_time_order = [str(x) for x in sorted(ids)] + inversed_receipt_time_order = list(reversed([str(x) for x in sorted(ids)])) def odd_cmp(x, y): if x % 2 == y % 2: return cmp(x, y) @@ -410,12 +410,12 @@ def test_backoffice_listing_order(pub): resp = app.get('/backoffice/management/form-title/') assert resp.body.count('data-link') == 17 ids = [x.strip('/') for x in re.findall(r'data-link="(.*?)"', resp.body)] - assert ids == receipt_time_order + assert ids == inversed_receipt_time_order - resp = app.get('/backoffice/management/form-title/?order_by=-receipt_time') + resp = app.get('/backoffice/management/form-title/?order_by=receipt_time') assert resp.body.count('data-link') == 17 ids = [x.strip('/') for x in re.findall(r'data-link="(.*?)"', resp.body)] - assert ids == list(reversed(receipt_time_order)) + assert ids == list(reversed(inversed_receipt_time_order)) resp = app.get('/backoffice/management/form-title/?order_by=last_update_time') assert resp.body.count('data-link') == 17 diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py index 48b6a0f4..f921545c 100644 --- a/wcs/backoffice/management.py +++ b/wcs/backoffice/management.py @@ -554,7 +554,7 @@ class ManagementDirectory(Directory): if not limit: limit = int(get_publisher().get_site_option('default-page-size') or 20) if not order_by: - order_by = get_publisher().get_site_option('default-sort-order') or 'receipt_time' + order_by = get_publisher().get_site_option('default-sort-order') or '-receipt_time' form.add_hidden('offset', offset) form.add_hidden('limit', limit) form.add_hidden('order_by', order_by) @@ -760,7 +760,7 @@ class ManagementDirectory(Directory): get_publisher().get_site_option('default-page-size') or 20)) offset = int(get_request().form.get('offset', 0)) order_by = get_request().form.get('order_by', - get_publisher().get_site_option('default-sort-order') or 'receipt_time') + get_publisher().get_site_option('default-sort-order') or '-receipt_time') criterias = self.get_global_listing_criterias() total_count = sql.AnyFormData.count(criterias) @@ -1088,7 +1088,7 @@ class FormPage(Directory): if get_publisher().is_using_postgresql(): if order_by is None: - order_by = get_publisher().get_site_option('default-sort-order') or 'receipt_time' + order_by = get_publisher().get_site_option('default-sort-order') or '-receipt_time' r += htmltext('') % order_by if get_publisher().is_using_postgresql(): @@ -1248,7 +1248,7 @@ class FormPage(Directory): limit = get_request().form.get('limit', 0) offset = get_request().form.get('offset', 0) order_by = get_request().form.get('order_by', - get_publisher().get_site_option('default-sort-order') or 'receipt_time') + get_publisher().get_site_option('default-sort-order') or '-receipt_time') query = get_request().form.get('q') qs = '' -- 2.11.0