Fix sort ordering of ajax/search always ascending

This commit is contained in:
Kovid Goyal 2015-10-23 09:40:38 +05:30
parent 12d1d5c8c2
commit da0364d29b

View File

@ -526,7 +526,7 @@ def books_in(ctx, rd, encoded_category, encoded_item, library_id):
# Search {{{ # Search {{{
def _search(ctx, rd, db, query, num, offset, sort, sort_order): def _search(ctx, rd, db, query, num, offset, sort, sort_order):
multisort = [(sanitize_sort_field_name(db.field_metadata, s), ensure_val(o, 'asc', 'desc')) multisort = [(sanitize_sort_field_name(db.field_metadata, s), ensure_val(o, 'asc', 'desc') == 'asc')
for s, o in zip(sort.split(','), cycle(sort_order.split(',')))] for s, o in zip(sort.split(','), cycle(sort_order.split(',')))]
skeys = db.field_metadata.sortable_field_keys() skeys = db.field_metadata.sortable_field_keys()
for sfield, sorder in multisort: for sfield, sorder in multisort:
@ -578,7 +578,6 @@ def interface_data(ctx, rd, library_id):
for x in ans['session_data']['sort'].split(','): for x in ans['session_data']['sort'].split(','):
s, o = x.partition(':')[::2] s, o = x.partition(':')[::2]
sorts.append(s.strip()), orders.append(o.strip()) sorts.append(s.strip()), orders.append(o.strip())
sort, sort_order = ans['session_data']['sort'].partition(',')[0].partition(':')[::2]
try: try:
num = int(rd.query.get('num', 50)) num = int(rd.query.get('num', 50))
except Exception: except Exception: