Unverified Commit ca2bcc64 authored by celogeek's avatar celogeek

Handle read config

Allow advance search
Remove duplicate status on show
parent 902685a1
...@@ -804,16 +804,20 @@ def get_search_results(term): ...@@ -804,16 +804,20 @@ def get_search_results(term):
func.lower(db.Books.title).ilike("%" + term + "%") func.lower(db.Books.title).ilike("%" + term + "%")
)).all() )).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() 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: 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 return cc
def get_download_link(book_id, book_format): def get_download_link(book_id, book_format):
......
...@@ -1529,7 +1529,7 @@ def show_book(book_id): ...@@ -1529,7 +1529,7 @@ def show_book(book_id):
except UnknownLocaleError: except UnknownLocaleError:
entries.languages[index].language_name = _( entries.languages[index].language_name = _(
isoLanguages.get(part3=entries.languages[index].lang_code).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 = [] book_in_shelfs = []
shelfs = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).all() shelfs = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).all()
for entry in shelfs: for entry in shelfs:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment