Compare commits
6 Commits
fix/code-s
...
c24dbd3ebe
Author | SHA1 | Date | |
---|---|---|---|
c24dbd3ebe | |||
f7278bf7ea | |||
cf1a5a532c
|
|||
0fd04d4797 | |||
a5bd954bb5
|
|||
881c3d3038 |
17
.drone.yml
17
.drone.yml
@ -27,8 +27,25 @@ steps:
|
||||
password:
|
||||
from_secret: "docker_password"
|
||||
when:
|
||||
event:
|
||||
- push
|
||||
branch:
|
||||
- main
|
||||
|
||||
- name: docker-publish-tag
|
||||
image: plugins/docker
|
||||
settings:
|
||||
registry: registry.wtf-eg.net
|
||||
repo: registry.wtf-eg.net/ki-backend
|
||||
target: ki-backend
|
||||
auto_tag: true
|
||||
username:
|
||||
from_secret: "docker_username"
|
||||
password:
|
||||
from_secret: "docker_password"
|
||||
when:
|
||||
event:
|
||||
- tag
|
||||
|
||||
image_pull_secrets:
|
||||
- dockerconfig
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
from flask import make_response, request
|
||||
|
||||
from ki.models import Profile, ProfileSkill, Skill, ProfileLanguage, Language
|
||||
from ki.models import Profile, ProfileSkill, Skill, ProfileLanguage, Language, Address
|
||||
|
||||
|
||||
def find_profiles():
|
||||
@ -25,13 +25,18 @@ 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(Profile.languages, isouter=True).join(ProfileLanguage.language, isouter=True) \
|
||||
.join(Address, isouter=True)
|
||||
|
||||
if "search" in request.args:
|
||||
terms = request.args["search"].split(" ")
|
||||
for term in terms:
|
||||
|
||||
query = query.filter(
|
||||
Profile.nickname.like(f"%{term}%") | Skill.name.like(f"%{term}%") | Language.name.like(f"%{term}%"))
|
||||
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}%"))
|
||||
|
||||
if "nickname" in request.args:
|
||||
nickname = request.args.get("nickname")
|
||||
|
Reference in New Issue
Block a user