diff --git a/cps/editbooks.py b/cps/editbooks.py index 0bb005fb..cfbae1e6 100644 --- a/cps/editbooks.py +++ b/cps/editbooks.py @@ -159,6 +159,7 @@ def delete_book(book_id, book_format): # delete book from Shelfs, Downloads, Read list ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).delete() ub.session.query(ub.ReadBook).filter(ub.ReadBook.book_id == book_id).delete() + ub.session.query(ub.ArchivedBook).filter(ub.ReadBook.book_id == book_id).delete() ub.delete_download(book_id) ub.session.commit() @@ -241,6 +242,7 @@ def render_edit_book(book_id): return render_title_template('book_edit.html', book=book, authors=author_names, cc=cc, title=_(u"edit metadata"), page="editbook", conversion_formats=allowed_conversion_formats, + config=config, source_formats=valid_source_formats) diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html index 78b427eb..efe86aed 100644 --- a/cps/templates/book_edit.html +++ b/cps/templates/book_edit.html @@ -185,8 +185,16 @@ {{_('Are you really sure?')}}