From d3421c671c67c4a0acafa992373355583decd7ca Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Thu, 18 Aug 2016 17:25:32 +0200
Subject: [PATCH] fix(alerting): make sure xorm can reset execution_error

---
 pkg/services/sqlstore/alert.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go
index 93bd950979d..be67749a627 100644
--- a/pkg/services/sqlstore/alert.go
+++ b/pkg/services/sqlstore/alert.go
@@ -222,7 +222,11 @@ func SetAlertState(cmd *m.SetAlertStateCommand) error {
 		alert.State = cmd.State
 		alert.StateChanges += 1
 		alert.NewStateDate = time.Now()
-		alert.ExecutionError = cmd.Error
+		if cmd.Error == "" {
+			alert.ExecutionError = " " //without this space, xorm skips updating this field
+		} else {
+			alert.ExecutionError = cmd.Error
+		}
 
 		sess.Id(alert.Id).Update(&alert)
 		return nil