From da0364d29b62383b40f76f2138d9bf42d5da8798 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 23 Oct 2015 09:40:38 +0530 Subject: [PATCH] Fix sort ordering of ajax/search always ascending --- src/calibre/srv/ajax.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/calibre/srv/ajax.py b/src/calibre/srv/ajax.py index 4000d4f6b4..95bb66d488 100644 --- a/src/calibre/srv/ajax.py +++ b/src/calibre/srv/ajax.py @@ -526,7 +526,7 @@ def books_in(ctx, rd, encoded_category, encoded_item, library_id): # Search {{{ 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(',')))] skeys = db.field_metadata.sortable_field_keys() for sfield, sorder in multisort: @@ -578,7 +578,6 @@ def interface_data(ctx, rd, library_id): for x in ans['session_data']['sort'].split(','): s, o = x.partition(':')[::2] sorts.append(s.strip()), orders.append(o.strip()) - sort, sort_order = ans['session_data']['sort'].partition(',')[0].partition(':')[::2] try: num = int(rd.query.get('num', 50)) except Exception: