Commit 2814617e authored by Ozzieisaacs's avatar Ozzieisaacs

Fix for #1660 (Pagination in advanced search not working, error 500 for no...

Fix for #1660 (Pagination in advanced search not working, error 500 for no filter in advanced search)
Fix #1666 (Pagination in search not working)
parent e8620a09
......@@ -1231,7 +1231,9 @@ def reconnect():
def search():
term = request.args.get("query")
if term:
return render_search_results(term, 0, None, config.config_books_per_page)
# flask_session['query'] = json.dumps(request.form)
return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term))
# return render_search_results(term, 0, None, config.config_books_per_page)
else:
return render_title_template('search.html',
searchterm="",
......@@ -1243,8 +1245,9 @@ def search():
@web.route("/advanced_search", methods=['POST'])
@login_required_if_no_ano
def advanced_search():
term = request.form
return render_adv_search_results(term, 0, None, config.config_books_per_page)
flask_session['query'] = json.dumps(request.form)
return redirect(url_for('web.books_list', data="advsearch", sort_param='stored', query=""))
def render_adv_search_results(term, offset=None, order=None, limit=None):
order = order or [db.Books.sort]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment