opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12052 from zexi/automated-cherry-pick-of-#12050-upstream-release-3.8

Browse Source 
Automated cherry pick of #12050: fix(glance): image fuzzy match by distro
This commit is contained in:
Zexi Li
2021-08-27 18:02:46 +08:00
committed by GitHub
parent 4573622ba5 0a4ad0a305
commit 9b9bcc881e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/image/models/images.go
+5 -2
View File
@@ -1271,11 +1271,14 @@ func (manager *SImageManager) ListItemFilter(
propQ := ImagePropertyManager.Query().In("name", nameKeys)
conds := make([]sqlchemy.ICondition, 0)
for _, val := range vals {
conds = append(conds, sqlchemy.Like(propQ.Field("value"), val))
field := propQ.Field("value")
conds = append(conds,
sqlchemy.Like(field, val),
sqlchemy.Contains(field, val))
}
propQ.Filter(sqlchemy.OR(conds...))
propSq := propQ.SubQuery()
q = q.Join(propSq, sqlchemy.Equals(q.Field("id"), propSq.Field("image_id")))
q = q.Join(propSq, sqlchemy.Equals(q.Field("id"), propSq.Field("image_id"))).Distinct()
}
propFilter([]string{api.IMAGE_OS_TYPE}, query.OsTypes)
propFilter([]string{api.IMAGE_OS_DISTRO, "distro"}, query.Distributions)