NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

advanced shelf search is working

Browse Source
This commit is contained in:
cbartondock 2021-03-06 22:15:18 -05:00
parent 870b2642a9
commit 05139e53be
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cps/web.py
View File

@ -37,7 +37,7 @@ from flask import session as flask_session
from flask_babel import gettext as _ from flask_babel import gettext as _
from flask_login import login_user, logout_user, login_required, current_user from flask_login import login_user, logout_user, login_required, current_user
from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError
from sqlalchemy.sql.expression import text, func, false, not_, and_ from sqlalchemy.sql.expression import text, func, false, not_, and_, or_
from sqlalchemy.orm.attributes import flag_modified from sqlalchemy.orm.attributes import flag_modified
from sqlalchemy.sql.functions import coalesce from sqlalchemy.sql.functions import coalesce
@ -1126,8 +1126,8 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
q = q.filter(db.Books.series.any(db.Series.id == serie)) q = q.filter(db.Books.series.any(db.Series.id == serie))
for serie in exclude_series_inputs: for serie in exclude_series_inputs:
q = q.filter(not_(db.Books.series.any(db.Series.id == serie))) q = q.filter(not_(db.Books.series.any(db.Series.id == serie)))
q = q.join(ub.BookShelf,db.Books.id==ub.BookShelf.book_id ,isouter=True)\ q = q.outerjoin(ub.BookShelf,db.Books.id==ub.BookShelf.book_id)\
.filter(ub.BookShelf.shelf.notin_(exclude_shelf_inputs)) .filter(or_(ub.BookShelf.shelf==None,ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
if len(include_shelf_inputs) >0: if len(include_shelf_inputs) >0:
q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs)) q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
for extension in include_extension_inputs: for extension in include_extension_inputs: