mirror of
https://github.com/janeczku/calibre-web
synced 2024-11-28 20:39:59 +00:00
added check for anonymous session in read_books, otherwise current_user.id is not defined
This commit is contained in:
parent
d336f9faa6
commit
3c9f8b151d
22
cps/web.py
22
cps/web.py
@ -1713,15 +1713,21 @@ def feed_get_cover(book_id):
|
|||||||
|
|
||||||
|
|
||||||
def render_read_books(page, are_read, as_xml=False):
|
def render_read_books(page, are_read, as_xml=False):
|
||||||
readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id)).filter(ub.ReadBook.is_read == True).all()
|
if not current_user.is_anonymous():
|
||||||
readBookIds = [x.book_id for x in readBooks]
|
readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id)).filter(ub.ReadBook.is_read == True).all()
|
||||||
if are_read:
|
readBookIds = [x.book_id for x in readBooks]
|
||||||
db_filter = db.Books.id.in_(readBookIds)
|
if are_read:
|
||||||
else:
|
db_filter = db.Books.id.in_(readBookIds)
|
||||||
db_filter = ~db.Books.id.in_(readBookIds)
|
else:
|
||||||
|
db_filter = ~db.Books.id.in_(readBookIds)
|
||||||
|
|
||||||
|
entries, random, pagination = fill_indexpage(page, db.Books,
|
||||||
|
db_filter, db.Books.timestamp.desc())
|
||||||
|
else:
|
||||||
|
entries = []
|
||||||
|
random = False
|
||||||
|
pagination = Pagination(page, 1, 0)
|
||||||
|
|
||||||
entries, random, pagination = fill_indexpage(page, db.Books,
|
|
||||||
db_filter, db.Books.timestamp.desc())
|
|
||||||
if as_xml:
|
if as_xml:
|
||||||
xml = render_title_template('feed.xml', entries=entries, pagination=pagination)
|
xml = render_title_template('feed.xml', entries=entries, pagination=pagination)
|
||||||
response = make_response(xml)
|
response = make_response(xml)
|
||||||
|
Loading…
Reference in New Issue
Block a user