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

Merge remote-tracking branch 'cn/chinese/master'

Browse Source 
# Conflicts:
#	cps/templates/search_form.html
This commit is contained in:
Ozzie Isaacs
2021-10-16 11:41:09 +02:00
parent 50d703e2d8 1b8410e786
commit 56a9c62421
4 changed files with 48 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cps/web.py
View File

@@ -1229,7 +1229,7 @@ def extend_search_term(searchterm,
format_date(datetime.strptime(pub_end, "%Y-%m-%d"),
format='medium', locale=get_locale())])
except ValueError:
pub_start = u""
pub_end = u""
elements = {'tag': db.Tags, 'serie':db.Series, 'shelf':ub.Shelf}
for key, db_element in elements.items():
tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['include_' + key])).all()
@@ -1300,7 +1300,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
column_end = term.get('custom_column_' + str(c.id) + '_end')
if column_start:
searchterm.extend([u"{} >= {}".format(c.name,
format_date(datetime.strptime(column_start, "%Y-%m-%d"),
format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
format='medium',
locale=get_locale())
)])