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

Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-06-19 18:55:34 -04:00
parent 93bc588dae 812112f2f6
commit 212a66ae5f
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/dashboard_acl.go
+2 -2
View File
@@ -27,7 +27,7 @@ func GetDashboardAclList(c *middleware.Context) Response {
}
func PostDashboardAcl(c *middleware.Context, cmd m.SetDashboardAclCommand) Response {
dashId := c.ParamsInt64(":id")
dashId := c.ParamsInt64(":dashboardId")
guardian := guardian.NewDashboardGuardian(dashId, c.OrgId, c.SignedInUser)
if canSave, err := guardian.CanSave(); err != nil || !canSave {
@@ -38,7 +38,7 @@ func PostDashboardAcl(c *middleware.Context, cmd m.SetDashboardAclCommand) Respo
cmd.DashboardId = dashId
if err := bus.Dispatch(&cmd); err != nil {
if err == m.ErrDashboardAclInfoMissing {
if err == m.ErrDashboardAclInfoMissing || err == m.ErrDashboardPermissionDashboardEmpty {
return ApiError(409, err.Error(), err)
}
return ApiError(500, "Failed to create permission", err)