Compare commits
3 Commits
c24dbd3ebe
...
test/docke
Author | SHA1 | Date | |
---|---|---|---|
18971e37c9 | |||
dd0ac1cf9e | |||
5e4d6d464d |
@ -22,6 +22,7 @@ steps:
|
||||
repo: registry.wtf-eg.net/ki-backend
|
||||
target: ki-backend
|
||||
auto_tag: true
|
||||
dry_run: true
|
||||
username:
|
||||
from_secret: "docker_username"
|
||||
password:
|
||||
@ -29,8 +30,6 @@ steps:
|
||||
when:
|
||||
event:
|
||||
- push
|
||||
branch:
|
||||
- main
|
||||
|
||||
- name: docker-publish-tag
|
||||
image: plugins/docker
|
||||
|
2
Pipfile
2
Pipfile
@ -14,7 +14,7 @@ flask-migrate = "~=3.0.1"
|
||||
flask-sqlalchemy = "~=2.5.1"
|
||||
sqlalchemy = "~=1.4.18"
|
||||
waitress = "~=2.0.0"
|
||||
pyyaml = "~=5.4.1"
|
||||
pyyaml = "~=6.0.1"
|
||||
flask-cors = "~=3.0.10"
|
||||
ldap3 = "~=2.9"
|
||||
pymysql = "~=1.0.2"
|
||||
|
860
Pipfile.lock
generated
860
Pipfile.lock
generated
File diff suppressed because it is too large
Load Diff
@ -4,7 +4,7 @@
|
||||
|
||||
from flask import make_response, request
|
||||
|
||||
from ki.models import Profile, ProfileSkill, Skill, ProfileLanguage, Language, Address
|
||||
from ki.models import Profile, ProfileSkill, Skill, ProfileLanguage, Language
|
||||
|
||||
|
||||
def find_profiles():
|
||||
@ -25,18 +25,13 @@ def find_profiles():
|
||||
.order_by(Profile.nickname) \
|
||||
.filter(Profile.visible.is_(True)) \
|
||||
.join(Profile.skills, isouter=True).join(ProfileSkill.skill, isouter=True) \
|
||||
.join(Profile.languages, isouter=True).join(ProfileLanguage.language, isouter=True) \
|
||||
.join(Address, isouter=True)
|
||||
.join(Profile.languages, isouter=True).join(ProfileLanguage.language, isouter=True)
|
||||
|
||||
if "search" in request.args:
|
||||
terms = request.args["search"].split(" ")
|
||||
for term in terms:
|
||||
|
||||
query = query.filter(
|
||||
Profile.nickname.like(f"%{term}%") | # noqa: W504
|
||||
Skill.name.like(f"%{term}%") | # noqa: W504
|
||||
Language.name.like(f"%{term}%") | # noqa: W504
|
||||
Address.name.like(f"%{term}%"))
|
||||
Profile.nickname.like(f"%{term}%") | Skill.name.like(f"%{term}%") | Language.name.like(f"%{term}%"))
|
||||
|
||||
if "nickname" in request.args:
|
||||
nickname = request.args.get("nickname")
|
||||
|
Reference in New Issue
Block a user