Merge branch 'master' into Develop

2025-03-30 13:48:08 +02:00
parent 1b1b7455d2 2b2ccb1710
commit dbdaa0884e
26 changed files with 118 additions and 1151 deletions
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -461,7 +461,7 @@ def get_sorted_entry(field, bookid):
                return make_response(jsonify(authors=" & ".join([a.name for a in calibre_db.order_authors([book])])))
    return ""

-    
+
@editbook.route("/ajax/simulatemerge", methods=['POST'])
@user_login_required
@edit_required