opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-29 17:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(alerting): requests looks to be working again

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-06-06 17:11:46 +02:00
parent d1acfb4494
commit 34e17f7282
33 changed files with 471 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/datasources.go
View File

@ -123,9 +123,7 @@ func GetDataSourceByName(c *middleware.Context) Response {
return ApiError(500, "Failed to query datasources", err)
}
ds := query.Result
dtos := convertModelToDtos(ds)
dtos := convertModelToDtos(query.Result)
return Json(200, &dtos)
}
@ -148,7 +146,7 @@ func GetDataSourceIdByName(c *middleware.Context) Response {
return Json(200, &dtos)
}
func convertModelToDtos(ds m.DataSource) dtos.DataSource {
func convertModelToDtos(ds *m.DataSource) dtos.DataSource {
return dtos.DataSource{
Id: ds.Id,
OrgId: ds.OrgId,