dashboard acl work

pkg/api/api.go

@@ -250,7 +250,7 @@ func (hs *HttpServer) registerRoutes() {
 
 				r.Group("/acl", func() {
 					r.Get("/", wrap(GetDashboardAclList))
-					r.Post("/", bind(m.SetDashboardAclCommand{}), wrap(PostDashboardAcl))
+					r.Post("/", bind(dtos.UpdateDashboardAclCommand{}), wrap(UpdateDashboardAcl))
 					r.Delete("/:aclId", wrap(DeleteDashboardAcl))
 				})
 			}, reqSignedIn)

pkg/api/dashboard_acl.go

@@ -1,12 +1,14 @@
 package api
 
 import (
+	"time"
+
+	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/metrics"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/guardian"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 func GetDashboardAclList(c *middleware.Context) Response {
@@ -27,7 +29,7 @@ func GetDashboardAclList(c *middleware.Context) Response {
 	return Json(200, list)
 }
 
-func PostDashboardAcl(c *middleware.Context, cmd m.SetDashboardAclCommand) Response {
+func UpdateDashboardAcl(c *middleware.Context, apiCmd dtos.UpdateDashboardAclCommand) Response {
 	dashId := c.ParamsInt64(":dashboardId")
 
 	guardian := guardian.NewDashboardGuardian(dashId, c.OrgId, c.SignedInUser)
@@ -35,9 +37,22 @@ func PostDashboardAcl(c *middleware.Context, cmd m.SetDashboardAclCommand) Respo
 		return dashboardGuardianResponse(err)
 	}
 
-	cmd.OrgId = c.OrgId
+	cmd := m.UpdateDashboardAclCommand{}
 	cmd.DashboardId = dashId
 
+	for _, item := range apiCmd.Items {
+		cmd.Items = append(cmd.Items, &m.DashboardAcl{
+			OrgId:       c.OrgId,
+			DashboardId: dashId,
+			UserId:      item.UserId,
+			UserGroupId: item.UserGroupId,
+			Role:        item.Role,
+			Permission:  item.Permission,
+			Created:     time.Now(),
+			Updated:     time.Now(),
+		})
+	}
+
 	if err := bus.Dispatch(&cmd); err != nil {
 		if err == m.ErrDashboardAclInfoMissing || err == m.ErrDashboardPermissionDashboardEmpty {
 			return ApiError(409, err.Error(), err)
@@ -45,12 +60,8 @@ func PostDashboardAcl(c *middleware.Context, cmd m.SetDashboardAclCommand) Respo
 		return ApiError(500, "Failed to create permission", err)
 	}
 
-	metrics.M_Api_Dashboard_Acl_Create.Inc(1)
-
-	return Json(200, &util.DynMap{
-		"permissionId": cmd.Result.Id,
-		"message":      "Permission created",
-	})
+	metrics.M_Api_Dashboard_Acl_Update.Inc(1)
+	return ApiSuccess("Dashboard acl updated")
 }
 
 func DeleteDashboardAcl(c *middleware.Context) Response {

pkg/api/dtos/acl.go

@@ -0,0 +1,16 @@
+package dtos
+
+import (
+	m "github.com/grafana/grafana/pkg/models"
+)
+
+type UpdateDashboardAclCommand struct {
+	Items []DashboardAclUpdateItem `json:"items"`
+}
+
+type DashboardAclUpdateItem struct {
+	UserId      int64            `json:"userId"`
+	UserGroupId int64            `json:"userGroupId"`
+	Role        m.RoleType       `json:"role"`
+	Permission  m.PermissionType `json:"permission"`
+}