0001-backoffice-invert-sort-order-from-new-to-old-ones-15.patch
| tests/test_backoffice_pages.py | ||
|---|---|---|
| 397 | 397 |
formdata.evolution[-1].time = datetime.datetime(2015, 2, 1, 10 + i % 2, i).timetuple() |
| 398 | 398 |
formdata.store() |
| 399 | 399 | |
| 400 |
receipt_time_order = [str(x) for x in sorted(ids)]
|
|
| 400 |
inversed_receipt_time_order = list(reversed([str(x) for x in sorted(ids)]))
|
|
| 401 | 401 |
def odd_cmp(x, y): |
| 402 | 402 |
if x % 2 == y % 2: |
| 403 | 403 |
return cmp(x, y) |
| ... | ... | |
| 410 | 410 |
resp = app.get('/backoffice/management/form-title/')
|
| 411 | 411 |
assert resp.body.count('data-link') == 17
|
| 412 | 412 |
ids = [x.strip('/') for x in re.findall(r'data-link="(.*?)"', resp.body)]
|
| 413 |
assert ids == receipt_time_order |
|
| 413 |
assert ids == inversed_receipt_time_order
|
|
| 414 | 414 | |
| 415 |
resp = app.get('/backoffice/management/form-title/?order_by=-receipt_time')
|
|
| 415 |
resp = app.get('/backoffice/management/form-title/?order_by=receipt_time')
|
|
| 416 | 416 |
assert resp.body.count('data-link') == 17
|
| 417 | 417 |
ids = [x.strip('/') for x in re.findall(r'data-link="(.*?)"', resp.body)]
|
| 418 |
assert ids == list(reversed(receipt_time_order)) |
|
| 418 |
assert ids == list(reversed(inversed_receipt_time_order))
|
|
| 419 | 419 | |
| 420 | 420 |
resp = app.get('/backoffice/management/form-title/?order_by=last_update_time')
|
| 421 | 421 |
assert resp.body.count('data-link') == 17
|
| wcs/backoffice/management.py | ||
|---|---|---|
| 554 | 554 |
if not limit: |
| 555 | 555 |
limit = int(get_publisher().get_site_option('default-page-size') or 20)
|
| 556 | 556 |
if not order_by: |
| 557 |
order_by = get_publisher().get_site_option('default-sort-order') or 'receipt_time'
|
|
| 557 |
order_by = get_publisher().get_site_option('default-sort-order') or '-receipt_time'
|
|
| 558 | 558 |
form.add_hidden('offset', offset)
|
| 559 | 559 |
form.add_hidden('limit', limit)
|
| 560 | 560 |
form.add_hidden('order_by', order_by)
|
| ... | ... | |
| 760 | 760 |
get_publisher().get_site_option('default-page-size') or 20))
|
| 761 | 761 |
offset = int(get_request().form.get('offset', 0))
|
| 762 | 762 |
order_by = get_request().form.get('order_by',
|
| 763 |
get_publisher().get_site_option('default-sort-order') or 'receipt_time')
|
|
| 763 |
get_publisher().get_site_option('default-sort-order') or '-receipt_time')
|
|
| 764 | 764 | |
| 765 | 765 |
criterias = self.get_global_listing_criterias() |
| 766 | 766 |
total_count = sql.AnyFormData.count(criterias) |
| ... | ... | |
| 1088 | 1088 | |
| 1089 | 1089 |
if get_publisher().is_using_postgresql(): |
| 1090 | 1090 |
if order_by is None: |
| 1091 |
order_by = get_publisher().get_site_option('default-sort-order') or 'receipt_time'
|
|
| 1091 |
order_by = get_publisher().get_site_option('default-sort-order') or '-receipt_time'
|
|
| 1092 | 1092 |
r += htmltext('<input type="hidden" name="order_by" value="%s"/>') % order_by
|
| 1093 | 1093 | |
| 1094 | 1094 |
if get_publisher().is_using_postgresql(): |
| ... | ... | |
| 1248 | 1248 |
limit = get_request().form.get('limit', 0)
|
| 1249 | 1249 |
offset = get_request().form.get('offset', 0)
|
| 1250 | 1250 |
order_by = get_request().form.get('order_by',
|
| 1251 |
get_publisher().get_site_option('default-sort-order') or 'receipt_time')
|
|
| 1251 |
get_publisher().get_site_option('default-sort-order') or '-receipt_time')
|
|
| 1252 | 1252 |
query = get_request().form.get('q')
|
| 1253 | 1253 | |
| 1254 | 1254 |
qs = '' |
| 1255 |
- |
|