From 3ef34c8f15496734c60b45b0d74b117eee55be08 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Thu, 8 Jun 2023 10:28:42 +0200 Subject: [PATCH] Bugfixes rename upper-lowercase after testrun --- cps/db.py | 2 +- cps/editbooks.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cps/db.py b/cps/db.py index 1be98d36..710c202f 100644 --- a/cps/db.py +++ b/cps/db.py @@ -287,7 +287,7 @@ class Languages(Base): self.lang_code = lang_code def get(self): - if self.language_name: + if hasattr(self, "language_name"): return self.language_name else: return self.lang_code diff --git a/cps/editbooks.py b/cps/editbooks.py index a8d84239..4d31b4fb 100755 --- a/cps/editbooks.py +++ b/cps/editbooks.py @@ -1319,10 +1319,12 @@ def remove_objects(db_book_object, db_session, del_elements): def add_objects(db_book_object, db_object, db_session, db_type, add_elements): changed = False - if db_type == 'custom': + if db_type == 'languages': + db_filter = db_object.lang_code + elif db_type == 'custom': db_filter = db_object.value else: - db_filter = db_object + db_filter = db_object.name for add_element in add_elements: # check if an element with that name exists changed = True