permissions: removes global access to bus from MakeUserAdmin.

pkg/api/dashboard.go

@@ -279,7 +279,7 @@ func (hs *HTTPServer) PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand)
 
 
 	if hs.Cfg.EditorsCanAdmin && newDashboard {
 	if hs.Cfg.EditorsCanAdmin && newDashboard {
 		inFolder := cmd.FolderId > 0
 		inFolder := cmd.FolderId > 0
-		err := dashboards.MakeUserAdmin(cmd.OrgId, cmd.UserId, dashboard.Id, !inFolder)
+		err := dashboards.MakeUserAdmin(hs.Bus, 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)

pkg/api/folder.go

@@ -62,7 +62,7 @@ func (hs *HTTPServer) CreateFolder(c *m.ReqContext, cmd m.CreateFolderCommand) R
 	}
 	}
 
 
 	if hs.Cfg.EditorsCanAdmin {
 	if hs.Cfg.EditorsCanAdmin {
-		if err := dashboards.MakeUserAdmin(c.OrgId, c.SignedInUser.UserId, cmd.Result.Id, true); err != nil {
+		if err := dashboards.MakeUserAdmin(hs.Bus, 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)
 		}
 		}

pkg/api/team.go

@@ -16,7 +16,7 @@ func (hs *HTTPServer) CreateTeam(c *m.ReqContext, cmd m.CreateTeamCommand) Respo
 		return Error(403, "Not allowed to create team.", nil)
 		return Error(403, "Not allowed to create team.", nil)
 	}
 	}
 
 
-	if err := bus.Dispatch(&cmd); err != nil {
+	if err := hs.Bus.Dispatch(&cmd); err != nil {
 		if err == m.ErrTeamNameTaken {
 		if err == m.ErrTeamNameTaken {
 			return Error(409, "Team name taken", err)
 			return Error(409, "Team name taken", err)
 		}
 		}
@@ -31,7 +31,7 @@ func (hs *HTTPServer) CreateTeam(c *m.ReqContext, cmd m.CreateTeamCommand) Respo
 			Permission: m.PERMISSION_ADMIN,
 			Permission: m.PERMISSION_ADMIN,
 		}
 		}
 
 
-		if err := bus.Dispatch(&addMemberCmd); err != nil {
+		if err := hs.Bus.Dispatch(&addMemberCmd); err != nil {
 			c.Logger.Error("Could not add creator to team.", "error", err)
 			c.Logger.Error("Could not add creator to team.", "error", err)
 		}
 		}
 	}
 	}

pkg/services/dashboards/acl_service.go

@@ -6,7 +6,7 @@ import (
 	"time"
 	"time"
 )
 )
 
 
-func MakeUserAdmin(orgId int64, userId int64, dashboardId int64, setViewAndEditPermissions bool) error {
+func MakeUserAdmin(bus bus.Bus, 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