jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

portal/search: compare case-insensitively

Browse source
This commit is contained in:
Iain Learmonth 2022-08-25 20:11:20 +01:00
parent a2ca710431
commit 2801eefd43
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/portal/__init__.py
View file

@ -4,7 +4,7 @@ from typing import Optional
from flask import Blueprint, render_template, request from flask import Blueprint, render_template, request
from flask.typing import ResponseReturnValue from flask.typing import ResponseReturnValue
from jinja2.utils import markupsafe from jinja2.utils import markupsafe
from sqlalchemy import desc, or_ from sqlalchemy import desc, or_, func
from app.alarms import alarms_for from app.alarms import alarms_for
from app.models.activity import Activity from app.models.activity import Activity
@ -129,8 +129,11 @@ def portal_home() -> ResponseReturnValue:
@portal.route("/search") @portal.route("/search")
def search() -> ResponseReturnValue: def search() -> ResponseReturnValue:
query = request.args.get("query") query = request.args.get("query")
proxies = Proxy.query.filter(or_(Proxy.url.contains(query)), Proxy.destroyed.is_(None)).all() proxies = Proxy.query.filter(
origins = Origin.query.filter(or_(Origin.description.contains(query), Origin.domain_name.contains(query))).all() or_(func.lower(Proxy.url).contains(query.lower())), Proxy.destroyed.is_(None)).all()
origins = Origin.query.filter(
or_(func.lower(Origin.description).contains(query.lower()),
func.lower(Origin.domain_name).contains(query.lower()))).all()
return render_template("search.html.j2", section="home", proxies=proxies, origins=origins) return render_template("search.html.j2", section="home", proxies=proxies, origins=origins)