tech: alert list react migration progress

This commit is contained in:
Torkel Ödegaard
2017-12-31 14:16:19 +01:00
parent 5a571f4784
commit 029317ed18
6 changed files with 189 additions and 106 deletions
+2 -2
View File
@@ -278,7 +278,7 @@ func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response {
}
var response models.AlertStateType = models.AlertStatePending
pausedState := "un paused"
pausedState := "un-paused"
if cmd.Paused {
response = models.AlertStatePaused
pausedState = "paused"
@@ -287,7 +287,7 @@ func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response {
result := map[string]interface{}{
"alertId": alertId,
"state": response,
"message": "alert " + pausedState,
"message": "Alert " + pausedState,
}
return Json(200, result)
+1 -1
View File
@@ -88,7 +88,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
params = append(params, query.PanelId)
}
if len(query.State) > 0 && query.State[0] != "ALL" {
if len(query.State) > 0 && query.State[0] != "all" {
sql.WriteString(` AND (`)
for i, v := range query.State {
if i > 0 {