fix(api): return correct json info after updating datasource

bergquist · bergquist · commit 8ee85626f218 · 2016-12-07T18:09:17.000+01:00
closes grafana#6869
diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -193,7 +193,7 @@ func Register(r *macaron.Macaron) {
 		r.Group("/datasources", func() {
 			r.Get("/", GetDataSources)
 			r.Post("/", quota("data_source"), bind(m.AddDataSourceCommand{}), AddDataSource)
-			r.Put("/:id", bind(m.UpdateDataSourceCommand{}), UpdateDataSource)
+			r.Put("/:id", bind(m.UpdateDataSourceCommand{}), wrap(UpdateDataSource))
 			r.Delete("/:id", DeleteDataSource)
 			r.Get("/:id", wrap(GetDataSourceById))
 			r.Get("/name/:name", wrap(GetDataSourceByName))
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
@@ -117,7 +117,7 @@ func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Resp
 		return ApiError(500, "Failed to update datasource", err)
 	}
 
-	return Json(200, "Datasource updated")
+	return Json(200, util.DynMap{"message": "Datasource updated"})
 }
 
 func fillWithSecureJsonData(cmd *m.UpdateDataSourceCommand) error {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Resp`
`117`	`117`	`return ApiError(500, "Failed to update datasource", err)`
`118`	`118`	`}`
`119`	`119`
`120`		`- return Json(200, "Datasource updated")`
	`120`	`+ return Json(200, util.DynMap{"message": "Datasource updated"})`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`func fillWithSecureJsonData(cmd *m.UpdateDataSourceCommand) error {`