refactor(alerting): refactoring PR for OR conditions, #6579

2016-11-17 15:48:15 +01:00
parent 457ae74343
commit 62e8a039a1
8 changed files with 32 additions and 30 deletions
@@ -119,8 +119,8 @@ func AlertTest(c *middleware.Context, dto dtos.AlertTestCommand) Response {
 	res := backendCmd.Result

 	dtoRes := &dtos.AlertTestResult{
-		Firing:     res.Firing,
-		FiringEval: res.FiringEval,
+		Firing:         res.Firing,
+		ConditionEvals: res.ConditionEvals,
 	}

 	if res.Error != nil {