Added name and id in response of create/update (grafana#7016)

utkarshcmu · torkelo · commit 13c4ce68ee45 · 2016-12-20T13:02:26.000+01:00
diff --git a/docs/sources/http_api/data_source.md b/docs/sources/http_api/data_source.md
@@ -158,7 +158,7 @@ parent = "http_api"
     HTTP/1.1 200
     Content-Type: application/json
 
-    {"id":1,"message":"Datasource added"}
+    {"id":1,"message":"Datasource added", "name": "test_datasource"}
 
 ## Update an existing data source
 
@@ -193,7 +193,7 @@ parent = "http_api"
     HTTP/1.1 200
     Content-Type: application/json
 
-    {"message":"Datasource updated"}
+    {"message":"Datasource updated", "id": 1, "name": "test_datasource"}
 
 ## Delete an existing data source
 
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
@@ -100,7 +100,7 @@ func AddDataSource(c *middleware.Context, cmd m.AddDataSourceCommand) {
 		return
 	}
 
-	c.JSON(200, util.DynMap{"message": "Datasource added", "id": cmd.Result.Id})
+	c.JSON(200, util.DynMap{"message": "Datasource added", "id": cmd.Result.Id, "name": cmd.Result.Name})
 }
 
 func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Response {
@@ -117,7 +117,7 @@ func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Resp
 		return ApiError(500, "Failed to update datasource", err)
 	}
 
-	return Json(200, util.DynMap{"message": "Datasource updated"})
+	return Json(200, util.DynMap{"message": "Datasource updated", "id": cmd.Id, "name": cmd.Name})
 }
 
 func fillWithSecureJsonData(cmd *m.UpdateDataSourceCommand) error {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func AddDataSource(c *middleware.Context, cmd m.AddDataSourceCommand) {`
`100`	`100`	`return`
`101`	`101`	`}`
`102`	`102`
`103`		`- c.JSON(200, util.DynMap{"message": "Datasource added", "id": cmd.Result.Id})`
	`103`	`+ c.JSON(200, util.DynMap{"message": "Datasource added", "id": cmd.Result.Id, "name": cmd.Result.Name})`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Response {`
`@@ -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, util.DynMap{"message": "Datasource updated"})`
	`120`	`+ return Json(200, util.DynMap{"message": "Datasource updated", "id": cmd.Id, "name": cmd.Name})`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`func fillWithSecureJsonData(cmd *m.UpdateDataSourceCommand) error {`