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

Merge pull request #4291 from utkarshcmu/ds-api

Browse Source 
Pulled out the common code
This commit is contained in:
Torkel Ödegaard 2016-03-08 12:03:49 +01:00
commit 1509b4cb6e
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/api/datasources.go
View File

@ -52,24 +52,9 @@ func GetDataSourceById(c *middleware.Context) Response {
}
ds := query.Result
dtos := convertModelToDtos(ds)
return Json(200, &dtos.DataSource{
Id: ds.Id,
OrgId: ds.OrgId,
Name: ds.Name,
Url: ds.Url,
Type: ds.Type,
Access: ds.Access,
Password: ds.Password,
Database: ds.Database,
User: ds.User,
BasicAuth: ds.BasicAuth,
BasicAuthUser: ds.BasicAuthUser,
BasicAuthPassword: ds.BasicAuthPassword,
WithCredentials: ds.WithCredentials,
IsDefault: ds.IsDefault,
JsonData: ds.JsonData,
})
return Json(200, &dtos)
}
func DeleteDataSource(c *middleware.Context) {
@ -145,8 +130,13 @@ func GetDataSourceByName(c *middleware.Context) Response {
}
ds := query.Result
dtos := convertModelToDtos(ds)
return Json(200, &dtos.DataSource{
return Json(200, &dtos)
}
func convertModelToDtos(ds m.DataSource) dtos.DataSource {
return dtos.DataSource{
Id: ds.Id,
OrgId: ds.OrgId,
Name: ds.Name,
@ -162,5 +152,5 @@ func GetDataSourceByName(c *middleware.Context) Response {
WithCredentials: ds.WithCredentials,
IsDefault: ds.IsDefault,
JsonData: ds.JsonData,
})
}
}