fix: enabled system triggers have empty condition

argoproj-labs · Jan 2, 2020 · 34466f3 · 34466f3
1 parent e38f4e3
commit 34466f3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -223,8 +223,8 @@ func (cfg *config) merge(other *config) *config {
 	}
 	for _, item := range other.Triggers {
 		if existing, ok := triggersMap[item.Name]; ok {
-			existing.Condition = coalesce(item.Condition)
-			existing.Template = coalesce(item.Template)
+			existing.Condition = coalesce(item.Condition, existing.Condition)
+			existing.Template = coalesce(item.Template, existing.Template)
 			if item.Enabled != nil {
 				existing.Enabled = item.Enabled
 			}
@@ -240,8 +240,8 @@ func (cfg *config) merge(other *config) *config {
 	}
 	for _, item := range other.Templates {
 		if existing, ok := templatesMap[item.Name]; ok {
-			existing.Body = coalesce(item.Body)
-			existing.Title = coalesce(item.Title)
+			existing.Body = coalesce(item.Body, existing.Body)
+			existing.Title = coalesce(item.Title, existing.Title)
 			templatesMap[item.Name] = existing
 		} else {
 			templatesMap[item.Name] = item