Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title
This commit is contained in:
commit
d9dde36c74
|
@ -802,7 +802,7 @@ def get_search_results(term):
|
|||
db.Books.authors.any(and_(*q)),
|
||||
db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + term + "%")),
|
||||
func.lower(db.Books.title).ilike("%" + term + "%")
|
||||
)).all()
|
||||
)).order_by(db.Books.sort).all()
|
||||
|
||||
def get_cc_columns():
|
||||
tmpcc = db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
|
||||
|
|
|
@ -912,7 +912,7 @@ def advanced_search():
|
|||
# Build custom columns names
|
||||
cc = get_cc_columns()
|
||||
db.session.connection().connection.connection.create_function("lower", 1, lcase)
|
||||
q = db.session.query(db.Books).filter(common_filters())
|
||||
q = db.session.query(db.Books).filter(common_filters()).order_by(db.Books.sort)
|
||||
|
||||
include_tag_inputs = request.args.getlist('include_tag')
|
||||
exclude_tag_inputs = request.args.getlist('exclude_tag')
|
||||
|
|
Loading…
Reference in New Issue
Block a user