entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 39 Releases Activity

backoffice: invert sort order, from new to old ones (#15545)

This commit is contained in:
Frédéric Péters 2017-03-22 10:05:08 +01:00
parent 59b02dcab2
commit 620f73e1e6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_backoffice_pages.py
View File

@ -396,7 +396,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)
@ -409,12 +409,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

8
wcs/backoffice/management.py
View File

@ -557,7 +557,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)
@ -763,7 +763,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)
@ -1091,7 +1091,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('<input type="hidden" name="order_by" value="%s"/>') % order_by
if get_publisher().is_using_postgresql():
@ -1251,7 +1251,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 = ''