public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 10630_folder_api

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-02-12 15:14:41 +01:00
parent 3a906ea335 5af2d09fb3
commit cb8c82f7f6
123 changed files with 1770 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/folder.go
+4 -4
View File
@@ -91,13 +91,13 @@ func CreateFolder(c *middleware.Context, cmd m.CreateFolderCommand) Response {
return ApiError(403, "Quota reached", nil)
}
dashItem := &dashboards.SaveDashboardItem{
saveDashboardDto := &dashboards.SaveDashboardDTO{
Dashboard: dashFolder,
OrgId: c.OrgId,
UserId: c.UserId,
}
folder, err := dashboards.GetRepository().SaveDashboard(dashItem)
folder, err := dashboards.GetRepository().SaveDashboard(saveDashboardDto)
if err != nil {
return toFolderError(err)
@@ -127,14 +127,14 @@ func UpdateFolder(c *middleware.Context, cmd m.UpdateFolderCommand) Response {
return ApiError(400, m.ErrFolderTitleEmpty.Error(), nil)
}
dashItem := &dashboards.SaveDashboardItem{
saveDashboardDto := &dashboards.SaveDashboardDTO{
Dashboard: dashFolder,
OrgId: c.OrgId,
UserId: c.UserId,
Overwrite: cmd.Overwrite,
}
folder, err := dashboards.GetRepository().SaveDashboard(dashItem)
folder, err := dashboards.GetRepository().SaveDashboard(saveDashboardDto)
if err != nil {
return toFolderError(err)