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

dashboard: only admin permission added to dashboard in folder.

Browse Source
This commit is contained in:
Leonard Gram 2019-03-11 15:34:32 +01:00
parent d593ffe3c1
commit 0b209de5d1
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/dashboard.go
View File

@ -279,7 +279,8 @@ func (hs *HTTPServer) PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand)
if hs.Cfg.EditorsCanOwn && newDashboard { if hs.Cfg.EditorsCanOwn && newDashboard {
aclService := dashboards.NewAclService() aclService := dashboards.NewAclService()
err := aclService.MakeUserAdmin(cmd.OrgId, cmd.UserId, dashboard.Id) inFolder := cmd.FolderId > 0
err := aclService.MakeUserAdmin(cmd.OrgId, cmd.UserId, dashboard.Id, !inFolder)
if err != nil { if err != nil {
hs.log.Error("Could not make user admin", "dashboard", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err) hs.log.Error("Could not make user admin", "dashboard", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err)
return Error(500, "Failed to make user admin of dashboard", err) return Error(500, "Failed to make user admin of dashboard", err)

2
pkg/api/folder.go
View File

@ -63,7 +63,7 @@ func (hs *HTTPServer) CreateFolder(c *m.ReqContext, cmd m.CreateFolderCommand) R
if hs.Cfg.EditorsCanOwn { if hs.Cfg.EditorsCanOwn {
aclService := dashboards.NewAclService() aclService := dashboards.NewAclService()
if err := aclService.MakeUserAdmin(c.OrgId, c.SignedInUser.UserId, cmd.Result.Id); err != nil { if err := aclService.MakeUserAdmin(c.OrgId, c.SignedInUser.UserId, cmd.Result.Id, true); err != nil {
hs.log.Error("Could not make user admin", "folder", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err) hs.log.Error("Could not make user admin", "folder", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err)
return Error(500, "Failed to make user admin of folder", err) return Error(500, "Failed to make user admin of folder", err)
} }

39
pkg/services/dashboards/acl_service.go
View File

@ -18,7 +18,7 @@ type AclService struct {
log log.Logger log log.Logger
} }
func (as *AclService) MakeUserAdmin(orgId int64, userId int64, dashboardId int64) error { func (as *AclService) MakeUserAdmin(orgId int64, userId int64, dashboardId int64, setViewAndEditPermissions bool) error {
rtEditor := models.ROLE_EDITOR rtEditor := models.ROLE_EDITOR
rtViewer := models.ROLE_VIEWER rtViewer := models.ROLE_VIEWER
@ -31,22 +31,27 @@ func (as *AclService) MakeUserAdmin(orgId int64, userId int64, dashboardId int64
Created: time.Now(), Created: time.Now(),
Updated: time.Now(), Updated: time.Now(),
}, },
{ }
OrgId: orgId,
DashboardId: dashboardId, if setViewAndEditPermissions {
Role: &rtEditor, items = append(items,
Permission: models.PERMISSION_EDIT, &models.DashboardAcl{
Created: time.Now(), OrgId: orgId,
Updated: time.Now(), DashboardId: dashboardId,
}, Role: &rtEditor,
{ Permission: models.PERMISSION_EDIT,
OrgId: orgId, Created: time.Now(),
DashboardId: dashboardId, Updated: time.Now(),
Role: &rtViewer, },
Permission: models.PERMISSION_VIEW, &models.DashboardAcl{
Created: time.Now(), OrgId: orgId,
Updated: time.Now(), DashboardId: dashboardId,
}, Role: &rtViewer,
Permission: models.PERMISSION_VIEW,
Created: time.Now(),
Updated: time.Now(),
},
)
} }
aclCmd := &models.UpdateDashboardAclCommand{ aclCmd := &models.UpdateDashboardAclCommand{