opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 03:19:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'react-mobx'

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-01-04 09:12:57 +01:00
parent ee05ea8d60 8abef88b94
commit c42a232644
54 changed files with 1578 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/alerting.go
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)