Commit 430ccd9a authored by Ozzie Isaacs's avatar Ozzie Isaacs

Merge branch 'master' into Develop

parents 557296b7 47d94d9b
...@@ -585,7 +585,7 @@ def load_dialogtexts(element_id): ...@@ -585,7 +585,7 @@ def load_dialogtexts(element_id):
elif element_id == "kobo_only_shelves_sync": elif element_id == "kobo_only_shelves_sync":
texts["main"] = _('Are you sure you want to change shelf sync behavior for the selected user(s)?') texts["main"] = _('Are you sure you want to change shelf sync behavior for the selected user(s)?')
elif element_id == "db_submit": elif element_id == "db_submit":
texts["main"] = _('Are you sure you want to change Calibre libray location?') texts["main"] = _('Are you sure you want to change Calibre library location?')
return json.dumps(texts) return json.dumps(texts)
......
...@@ -1086,7 +1086,7 @@ def scholar_search(query): ...@@ -1086,7 +1086,7 @@ def scholar_search(query):
break break
return Response(json.dumps(result),mimetype='application/json') return Response(json.dumps(result),mimetype='application/json')
else: else:
return [] return "[]"
@editbook.route("/ajax/editbooks/<param>", methods=['POST']) @editbook.route("/ajax/editbooks/<param>", methods=['POST'])
@login_required_if_no_ano @login_required_if_no_ano
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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