mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-15 07:37:40 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ozzieisaacs
2020-05-01 17:19:13 +02:00
parent 547bbecef1 ca2bcc647d
commit b95f6563cc
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cps/helper.py
View File

@@ -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 = []
for col in tmpcc:
r = re.compile(config.config_columns_to_ignore)
if not r.match(col.name):
cc.append(col)
else:
cc = tmpcc
r = re.compile(config.config_columns_to_ignore)
for col in tmpcc:
if filter_config_custom_read and config.config_read_column and config.config_read_column == col.id:
continue
if r and r.match(col.label):
continue
cc.append(col)
return cc