Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop

cps/helper.py

@@ -860,16 +860,20 @@ def get_search_results(term):
             )).order_by(db.Books.sort).all()
 
 
-def get_cc_columns():
+def get_cc_columns(filter_config_custom_read=False):
     tmpcc = db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
+    cc = []
+    r = None
     if config.config_columns_to_ignore:
-        cc = []
+        r = re.compile(config.config_columns_to_ignore)
-        for col in tmpcc:
+
-            r = re.compile(config.config_columns_to_ignore)
+    for col in tmpcc:
-            if not r.match(col.name):
+        if filter_config_custom_read and config.config_read_column and config.config_read_column == col.id:
-                cc.append(col)
+            continue
-    else:
+        if r and r.match(col.label):
-        cc = tmpcc
+            continue
+        cc.append(col)
+
     return cc
 
 

cps/web.py

@@ -1593,7 +1593,7 @@ def show_book(book_id):
             except UnknownLocaleError:
                 entries.languages[index].language_name = _(
                     isoLanguages.get(part3=entries.languages[index].lang_code).name)
-        cc = get_cc_columns()
+        cc = get_cc_columns(filter_config_custom_read=True)
         book_in_shelfs = []
         shelfs = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).all()
         for entry in shelfs: