This commit is contained in:
OzzieIsaacs
2017-11-17 18:29:29 +01:00
parent 211c3b16dd
commit 6e714f3f16
3 changed files with 13 additions and 16 deletions
+8 -13
View File
@@ -1757,20 +1757,15 @@ def feed_get_cover(book_id):
def render_read_books(page, are_read, as_xml=False):
if not current_user.is_anonymous:
readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id)).filter(ub.ReadBook.is_read == True).all()
readBookIds = [x.book_id for x in readBooks]
if are_read:
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())
readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id)).filter(ub.ReadBook.is_read == True).all()
readBookIds = [x.book_id for x in readBooks]
if are_read:
db_filter = db.Books.id.in_(readBookIds)
else:
entries = []
random = False
pagination = Pagination(page, 1, 0)
db_filter = ~db.Books.id.in_(readBookIds)
entries, random, pagination = fill_indexpage(page, db.Books,
db_filter, db.Books.timestamp.desc())
if as_xml:
xml = render_title_template('feed.xml', entries=entries, pagination=pagination)