Merge branch 'master' of https://github.com/oh-ok/calibre-web-two-page-comic
This commit is contained in:
commit
094aac9f35
|
@ -829,8 +829,6 @@ class CalibreDB:
|
|||
|
||||
# Orders all Authors in the list according to authors sort
|
||||
def order_authors(self, entries, list_return=False, combined=False):
|
||||
# entries_copy = copy.deepcopy(entries)
|
||||
# entries_copy =[]
|
||||
for entry in entries:
|
||||
if combined:
|
||||
sort_authors = entry.Books.author_sort.split('&')
|
||||
|
|
|
@ -358,7 +358,7 @@
|
|||
<h4 class="panel-title">
|
||||
<a class="accordion-toggle" data-toggle="collapse" href="#collapsesix">
|
||||
<span class="glyphicon glyphicon-plus"></span>
|
||||
{{_('Securitiy Settings')}}
|
||||
{{_('Security Settings')}}
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
|
|
|
@ -1516,7 +1516,6 @@ def profile():
|
|||
@viewer_required
|
||||
def read_book(book_id, book_format):
|
||||
book = calibre_db.get_filtered_book(book_id)
|
||||
book.ordered_authors = calibre_db.order_authors([book], False)
|
||||
|
||||
if not book:
|
||||
flash(_("Oops! Selected book is unavailable. File does not exist or is not accessible"),
|
||||
|
@ -1524,6 +1523,8 @@ def read_book(book_id, book_format):
|
|||
log.debug("Selected book is unavailable. File does not exist or is not accessible")
|
||||
return redirect(url_for("web.index"))
|
||||
|
||||
book.ordered_authors = calibre_db.order_authors([book], False)
|
||||
|
||||
# check if book has a bookmark
|
||||
bookmark = None
|
||||
if current_user.is_authenticated:
|
||||
|
|
Loading…
Reference in New Issue