Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-11 05:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further fix delete books (#119)

Browse Source
This commit is contained in:
OzzieIsaacs 2017-04-15 18:07:53 +02:00
parent 9c679c8908
commit 2b8c29c535
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cps/web.py
View File

@ -1302,19 +1302,20 @@ def delete_book(book_id):
for c in cc: for c in cc:
cc_string = "custom_column_" + str(c.id) cc_string = "custom_column_" + str(c.id)
if not c.is_multiple: if not c.is_multiple:
if c.datatype == 'bool': if len(getattr(book, cc_string)) > 0:
del_cc = getattr(book, cc_string)[0] if c.datatype == 'bool':
getattr(book, cc_string).remove(del_cc) del_cc = getattr(book, cc_string)[0]
db.session.delete(del_cc) getattr(book, cc_string).remove(del_cc)
elif c.datatype == 'rating': db.session.delete(del_cc)
del_cc = getattr(book, cc_string)[0] elif c.datatype == 'rating':
getattr(book, cc_string).remove(del_cc) del_cc = getattr(book, cc_string)[0]
if len(del_cc.books) == 0: getattr(book, cc_string).remove(del_cc)
if len(del_cc.books) == 0:
db.session.delete(del_cc)
else:
del_cc = getattr(book, cc_string)[0]
getattr(book, cc_string).remove(del_cc)
db.session.delete(del_cc) db.session.delete(del_cc)
else:
del_cc = getattr(book, cc_string)[0]
getattr(book, cc_string).remove(del_cc)
db.session.delete(del_cc)
else: else:
modify_database_object([u''], getattr(book, cc_string),db.cc_classes[c.id], db.session, 'custom') modify_database_object([u''], getattr(book, cc_string),db.cc_classes[c.id], db.session, 'custom')
db.session.query(db.Books).filter(db.Books.id == book_id).delete() db.session.query(db.Books).filter(db.Books.id == book_id).delete()