Make query search for include instead of prefix
This commit is contained in:
@@ -23,7 +23,7 @@ func (s Store) convertApplicationFilter(f types.ApplicationFilter) (query squirr
|
||||
}
|
||||
|
||||
if f.Query != "" {
|
||||
qs := f.Query + "%"
|
||||
qs := "%" + f.Query + "%"
|
||||
query = query.Where(squirrel.Or{
|
||||
squirrel.Like{"app.name": qs},
|
||||
})
|
||||
|
||||
@@ -21,7 +21,7 @@ func (s Store) convertAutomationWorkflowFilter(f types.WorkflowFilter) (query sq
|
||||
}
|
||||
|
||||
if f.Query != "" {
|
||||
qs := f.Query + "%"
|
||||
qs := "%" + f.Query + "%"
|
||||
query = query.Where(squirrel.Or{
|
||||
squirrel.Like{"atmwf.handle": qs},
|
||||
})
|
||||
|
||||
@@ -26,7 +26,7 @@ func (s Store) convertRoleFilter(f types.RoleFilter) (query squirrel.SelectBuild
|
||||
}
|
||||
|
||||
if f.Query != "" {
|
||||
qs := f.Query + "%"
|
||||
qs := "%" + f.Query + "%"
|
||||
query = query.Where(squirrel.Or{
|
||||
squirrel.Like{"rl.name": qs},
|
||||
squirrel.Like{"rl.handle": qs},
|
||||
|
||||
@@ -11,6 +11,10 @@ func (s Store) convertTemplateFilter(f types.TemplateFilter) (query squirrel.Sel
|
||||
|
||||
query = filter.StateCondition(query, "tpl.deleted_at", f.Deleted)
|
||||
|
||||
if len(f.TemplateID) > 0 {
|
||||
query = query.Where(squirrel.Eq{"tpl.id": f.TemplateID})
|
||||
}
|
||||
|
||||
if len(f.LabeledIDs) > 0 {
|
||||
query = query.Where(squirrel.Eq{"tpl.id": f.LabeledIDs})
|
||||
}
|
||||
@@ -19,15 +23,14 @@ func (s Store) convertTemplateFilter(f types.TemplateFilter) (query squirrel.Sel
|
||||
query = query.Where(squirrel.Eq{"tpl.partial": true})
|
||||
}
|
||||
|
||||
if len(f.TemplateID) > 0 {
|
||||
query = query.Where(squirrel.Eq{"tpl.id": f.TemplateID})
|
||||
}
|
||||
if f.Handle != "" {
|
||||
query = query.Where(squirrel.Eq{"tpl.handle": f.Handle})
|
||||
query = query.Where(squirrel.Like{"tpl.handle": "%" + f.Handle + "%"})
|
||||
}
|
||||
|
||||
if f.Type != "" {
|
||||
query = query.Where(squirrel.Eq{"tpl.type": f.Type})
|
||||
}
|
||||
|
||||
if f.OwnerID > 0 {
|
||||
query = query.Where(squirrel.Eq{"tpl.rel_owner": f.OwnerID})
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ func (s Store) convertUserFilter(f types.UserFilter) (query squirrel.SelectBuild
|
||||
}
|
||||
|
||||
if f.Query != "" {
|
||||
qs := f.Query + "%"
|
||||
qs := "%" + f.Query + "%"
|
||||
query = query.Where(squirrel.Or{
|
||||
squirrel.Like{"usr.username": qs},
|
||||
squirrel.Like{"usr.handle": qs},
|
||||
|
||||
Reference in New Issue
Block a user