From 22d77263f8f8cadf21071909277626b8093198d6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 18 May 2017 17:29:07 +0530 Subject: [PATCH] Fix the Show more books button not respecting the current virtual library --- src/calibre/srv/code.py | 6 +++--- src/pyj/book_list/views.pyj | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/srv/code.py b/src/calibre/srv/code.py index 2219f64041..81f591835a 100644 --- a/src/calibre/srv/code.py +++ b/src/calibre/srv/code.py @@ -228,9 +228,9 @@ def more_books(ctx, rd): raise HTTPNotFound('Invalid number of books: %r' % rd.query.get('num')) try: search_query = load_json_file(rd.request_body_file) - query, offset, sorts, orders = search_query['query'], search_query[ + query, offset, sorts, orders, vl = search_query['query'], search_query[ 'offset' - ], search_query['sort'], search_query['sort_order'] + ], search_query['sort'], search_query['sort_order'], search_query['vl'] except KeyError as err: raise HTTPBadRequest('Search query missing key: %s' % as_unicode(err)) except Exception as err: @@ -238,7 +238,7 @@ def more_books(ctx, rd): ans = {} with db.safe_read_lock: ans['search_result'] = search_result( - ctx, rd, db, query, num, offset, sorts, orders + ctx, rd, db, query, num, offset, sorts, orders, vl ) mdata = ans['metadata'] = {} for book_id in ans['search_result']['book_ids']: diff --git a/src/pyj/book_list/views.pyj b/src/pyj/book_list/views.pyj index 43b0333f37..4e20865fbf 100644 --- a/src/pyj/book_list/views.pyj +++ b/src/pyj/book_list/views.pyj @@ -185,7 +185,7 @@ def got_more_books(end_type, xhr, event): def get_more_books(): data = {'offset':book_list_data.shown_book_ids.length} - for key in 'query', 'sort', 'sort_order': + for key in 'query', 'sort', 'sort_order', 'vl': data[key] = library_data.search_result[key] book_list_data.fetching_more_books = ajax_send( 'interface-data/more-books', data, got_more_books,