bugfix for both filter and search in expressions

web-ridge · Oct 8, 2021 · caddabd · caddabd
1 parent fcd1ba2
commit caddabd
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/template_files/generated_filter.gotpl b/template_files/generated_filter.gotpl
@@ -305,12 +305,21 @@ func IntFilterToMods(m *{{ $.Frontend.PackageName }}.IntFilter, column string) [
 				return nil
 			}
 			if m.Search != nil || m.Where != nil {
-				var queryMods []qm.QueryMod
-				queryMods  = append(queryMods, {{ .BoilerModel.Name }}SearchToMods(m.Search)...)
-				queryMods  = append(queryMods, {{ .BoilerModel.Name }}WhereToMods(m.Where, true, "", "")...)
-				if len(queryMods) > 0 {
+
+				searchMods := {{ .BoilerModel.Name }}SearchToMods(m.Search)
+				filterMods := {{ .BoilerModel.Name }}WhereToMods(m.Where, true, "", "")
+				if len(searchMods) > 0 && len(filterMods) > 0 {
+					return []qm.QueryMod{
+						qm.Expr(searchMods...),
+						qm.Expr(filterMods...),
+					}
+				} else if len(searchMods) > 0 {
+					return []qm.QueryMod{
+						qm.Expr(searchMods...),
+					}
+				} else if len(filterMods) > 0 {
 					return []qm.QueryMod{
-						qm.Expr(queryMods...),
+						qm.Expr(filterMods...),
 					}
 				}
 			}