mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-28 13:57:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/kobo_sync_status.py
#	test/Calibre-Web TestSummary_Linux.html
This commit is contained in:
Ozzie Isaacs
2021-12-19 10:29:56 +01:00
parent 42bf40d7bb 592288cb22
commit 2e815147fb
57 changed files with 3302 additions and 2981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cps/editbooks.py
View File

@@ -241,14 +241,14 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
@editbook.route("/ajax/delete/<int:book_id>")
@login_required
def delete_book_from_details(book_id):
return Response(delete_book(book_id, "", True), mimetype='application/json')
return Response(delete_book_from_table(book_id, "", True), mimetype='application/json')
@editbook.route("/delete/<int:book_id>", defaults={'book_format': ""})
@editbook.route("/delete/<int:book_id>/<string:book_format>")
@login_required
def delete_book_ajax(book_id, book_format):
return delete_book(book_id, book_format, False)
return delete_book_from_table(book_id, book_format, False)
def delete_whole_book(book_id, book):
@@ -318,7 +318,7 @@ def render_delete_book_result(book_format, jsonResponse, warning, book_id):
return redirect(url_for('web.index'))
def delete_book(book_id, book_format, jsonResponse):
def delete_book_from_table(book_id, book_format, jsonResponse):
warning = {}
if current_user.role_delete_books():
book = calibre_db.get_book(book_id)
@@ -1295,7 +1295,7 @@ def merge_list_book():
element.format,
element.uncompressed_size,
to_name))
delete_book(from_book.id,"", True)
delete_book_from_table(from_book.id,"", True)
return json.dumps({'success': True})
return ""