IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: fix param names in ctx.ParamsInt64 (#39223)

Browse Source
This commit is contained in:
Serge Zaitsev 2021-09-15 13:14:15 +03:00 committed by GitHub
parent fdc681788b
commit 6005e6572d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/alerting.go
View File

@ -235,7 +235,7 @@ func getAlertNotificationsInternal(c *models.ReqContext) ([]*models.AlertNotific
func GetAlertNotificationByID(c *models.ReqContext) response.Response { func GetAlertNotificationByID(c *models.ReqContext) response.Response {
query := &models.GetAlertNotificationsQuery{ query := &models.GetAlertNotificationsQuery{
OrgId: c.OrgId, OrgId: c.OrgId,
Id: c.ParamsInt64("notificationId"), Id: c.ParamsInt64(":notificationId"),
} }
if query.Id == 0 { if query.Id == 0 {
@ -393,7 +393,7 @@ func fillWithSecureSettingsDataByUID(cmd *models.UpdateAlertNotificationWithUidC
func DeleteAlertNotification(c *models.ReqContext) response.Response { func DeleteAlertNotification(c *models.ReqContext) response.Response {
cmd := models.DeleteAlertNotificationCommand{ cmd := models.DeleteAlertNotificationCommand{
OrgId: c.OrgId, OrgId: c.OrgId,
Id: c.ParamsInt64("notificationId"), Id: c.ParamsInt64(":notificationId"),
} }
if err := bus.Dispatch(&cmd); err != nil { if err := bus.Dispatch(&cmd); err != nil {
@ -453,7 +453,7 @@ func NotificationTest(c *models.ReqContext, dto dtos.NotificationTestCommand) re
// POST /api/alerts/:alertId/pause // POST /api/alerts/:alertId/pause
func PauseAlert(c *models.ReqContext, dto dtos.PauseAlertCommand) response.Response { func PauseAlert(c *models.ReqContext, dto dtos.PauseAlertCommand) response.Response {
alertID := c.ParamsInt64("alertId") alertID := c.ParamsInt64(":alertId")
result := make(map[string]interface{}) result := make(map[string]interface{})
result["alertId"] = alertID result["alertId"] = alertID

2
pkg/api/datasources.go
View File

@ -430,7 +430,7 @@ func convertModelToDtos(ds *models.DataSource) dtos.DataSource {
// CheckDatasourceHealth sends a health check request to the plugin datasource // CheckDatasourceHealth sends a health check request to the plugin datasource
// /api/datasource/:id/health // /api/datasource/:id/health
func (hs *HTTPServer) CheckDatasourceHealth(c *models.ReqContext) response.Response { func (hs *HTTPServer) CheckDatasourceHealth(c *models.ReqContext) response.Response {
datasourceID := c.ParamsInt64("id") datasourceID := c.ParamsInt64(":id")
ds, err := hs.DataSourceCache.GetDatasource(datasourceID, c.SignedInUser, c.SkipCache) ds, err := hs.DataSourceCache.GetDatasource(datasourceID, c.SignedInUser, c.SkipCache)
if err != nil { if err != nil {