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

Further fixes for #1530 (Handle improper migrated database with config_mature_content_tags, allowed_tags, denied_tags, denied_column_value, allowed_column_value NULL instead of "")

Browse Source
This commit is contained in:
Ozzie Isaacs 2020-07-22 18:44:03 +02:00
parent 0ccc3f7252
commit 25fc6f1937
2 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cps/config_sql.py
View File

@ -214,25 +214,20 @@ class _ConfigSQL(object):
return self.show_element_new_user(constants.DETAIL_RANDOM) return self.show_element_new_user(constants.DETAIL_RANDOM)
def list_denied_tags(self): def list_denied_tags(self):
try: mct = self.config_denied_tags or ""
mct = self.config_denied_tags.split(",") return [t.strip() for t in mct.split(",")]
return [t.strip() for t in mct]
except AttributeError:
# Fix for improper migrated database with config_mature_content_tags NULL instead of ""
self.config_denied_tags = ""
return ['']
def list_allowed_tags(self): def list_allowed_tags(self):
mct = self.config_allowed_tags.split(",") mct = self.config_allowed_tags or ""
return [t.strip() for t in mct] return [t.strip() for t in mct.split(",")]
def list_denied_column_values(self): def list_denied_column_values(self):
mct = self.config_denied_column_value.split(",") mct = self.config_denied_column_value or ""
return [t.strip() for t in mct] return [t.strip() for t in mct.split(",")]
def list_allowed_column_values(self): def list_allowed_column_values(self):
mct = self.config_allowed_column_value.split(",") mct = self.config_allowed_column_value or ""
return [t.strip() for t in mct] return [t.strip() for t in mct.split(",")]
def get_log_level(self): def get_log_level(self):
return logger.get_level_name(self.config_log_level) return logger.get_level_name(self.config_log_level)

22
cps/ub.py
View File

@ -176,26 +176,20 @@ class UserBase:
return self.check_visibility(constants.DETAIL_RANDOM) return self.check_visibility(constants.DETAIL_RANDOM)
def list_denied_tags(self): def list_denied_tags(self):
try: mct = self.denied_tags or ""
mct = self.denied_tags.split(",") return [t.strip() for t in mct.split(",")]
return [t.strip() for t in mct]
except AttributeError:
# Fix for improper migrated database with config_mature_content_tags NULL instead of ""
self.denied_tags=""
return ['']
def list_allowed_tags(self): def list_allowed_tags(self):
mct = self.allowed_tags.split(",") mct = self.allowed_tags or ""
return [t.strip() for t in mct] return [t.strip() for t in mct.split(",")]
def list_denied_column_values(self): def list_denied_column_values(self):
mct = self.denied_column_value.split(",") mct = self.denied_column_value or ""
return [t.strip() for t in mct] return [t.strip() for t in mct.split(",")]
def list_allowed_column_values(self): def list_allowed_column_values(self):
mct = self.allowed_column_value.split(",") mct = self.allowed_column_value or ""
return [t.strip() for t in mct] return [t.strip() for t in mct.split(",")]
def __repr__(self): def __repr__(self):
return '<User %r>' % self.nickname return '<User %r>' % self.nickname