Commit d6fbcdb0 authored by OzzieIsaacs's avatar OzzieIsaacs

Fix merge problem (ub prefix in ub.py)

parent d39b28b0
...@@ -677,20 +677,20 @@ def update_download(book_id, user_id): ...@@ -677,20 +677,20 @@ def update_download(book_id, user_id):
if not check: if not check:
new_download = Downloads(user_id=user_id, book_id=book_id) new_download = Downloads(user_id=user_id, book_id=book_id)
ub.session.add(new_download) session.add(new_download)
try: try:
ub.session.commit() session.commit()
except exc.OperationalError: except exc.OperationalError:
ub.session.rollback() session.rollback()
# Delete non exisiting downloaded books in calibre-web's own database # Delete non exisiting downloaded books in calibre-web's own database
def delete_download(book_id): def delete_download(book_id):
ub.session.query(Downloads).filter(book_id == Downloads.book_id).delete() session.query(Downloads).filter(book_id == Downloads.book_id).delete()
try: try:
ub.session.commit() session.commit()
except exc.OperationalError: except exc.OperationalError:
ub.session.rollback() session.rollback()
# Generate user Guest (translated text), as anonymous user, no rights # Generate user Guest (translated text), as anonymous user, no rights
def create_anonymous_user(session): def create_anonymous_user(session):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment