user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved error handling for disapearing custom column linked to visiblility restrictions

Browse Source
This commit is contained in:
Ozzieisaacs
2021-05-01 20:52:48 +02:00
parent b97373bf37
commit 541c8c4b93
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/web.py
+3 -3
View File
@@ -184,8 +184,8 @@ def toggle_read(book_id):
calibre_db.session.add(new_cc)
calibre_db.session.commit()
except (KeyError, AttributeError):
log.error(u"Custom Column No.%d is not exisiting in calibre database", config.config_read_column)
return "Custom Column No.{} is not exisiting in calibre database".format(config.config_read_column), 400
log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column), 400
except (OperationalError, InvalidRequestError) as e:
calibre_db.session.rollback()
log.error(u"Read status could not set: %e", e)
@@ -1126,7 +1126,7 @@ def adv_search_read_status(q, read_status):
q = q.join(db.cc_classes[config.config_read_column], isouter=True) \
.filter(coalesce(db.cc_classes[config.config_read_column].value, False) != True)
except (KeyError, AttributeError):
log.error(u"Custom Column No.%d is not exisiting in calibre database", config.config_read_column)
log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
flash(_("Custom Column No.%(column)d is not existing in calibre database",
column=config.config_read_column),
category="error")