acl fixes

pkg/api/dashboard_acl.go

@@ -20,13 +20,12 @@ func GetDashboardAclList(c *middleware.Context) Response {
 		return dashboardGuardianResponse(err)
 	}
 
-	query := m.GetDashboardAclInfoListQuery{DashboardId: dashId}
-	if err := bus.Dispatch(&query); err != nil {
-		return ApiError(500, "Failed to get Dashboard ACL", err)
+	acl, err := guardian.GetAcl()
+	if err != nil {
+		return ApiError(500, "Failed to get dashboard acl", err)
 	}
 
-	list := query.Result
-	return Json(200, list)
+	return Json(200, acl)
 }
 
 func UpdateDashboardAcl(c *middleware.Context, apiCmd dtos.UpdateDashboardAclCommand) Response {

pkg/api/dashboard_acl_test.go

@@ -30,7 +30,7 @@ func TestDashboardAclApiEndpoint(t *testing.T) {
 			return nil
 		})
 
-		bus.AddHandler("test", func(query *models.GetInheritedDashboardAclQuery) error {
+		bus.AddHandler("test", func(query *models.GetDashboardAclInfoListQuery) error {
 			query.Result = mockResult
 			return nil
 		})

pkg/api/dashboard_test.go

@@ -31,7 +31,7 @@ func TestDashboardApiEndpoint(t *testing.T) {
 		})
 
 		aclMockResp := []*models.DashboardAcl{}
-		bus.AddHandler("test", func(query *models.GetInheritedDashboardAclQuery) error {
+		bus.AddHandler("test", func(query *models.GetDashboardAclInfoListQuery) error {
 			query.Result = aclMockResp
 			return nil
 		})
@@ -179,7 +179,7 @@ func TestDashboardApiEndpoint(t *testing.T) {
 			},
 		}
 
-		bus.AddHandler("test", func(query *models.GetInheritedDashboardAclQuery) error {
+		bus.AddHandler("test", func(query *models.GetDashboardAclInfoListQuery) error {
 			query.Result = aclMockResp
 			return nil
 		})
@@ -276,7 +276,7 @@ func TestDashboardApiEndpoint(t *testing.T) {
 				{Id: 1, OrgId: 1, DashboardId: 2, UserId: 1, Permission: models.PERMISSION_EDIT},
 			}
 
-			bus.AddHandler("test", func(query *models.GetInheritedDashboardAclQuery) error {
+			bus.AddHandler("test", func(query *models.GetDashboardAclInfoListQuery) error {
 				query.Result = mockResult
 				return nil
 			})
@@ -318,7 +318,7 @@ func TestDashboardApiEndpoint(t *testing.T) {
 				{Id: 1, OrgId: 1, DashboardId: 2, UserId: 1, Permission: models.PERMISSION_VIEW},
 			}
 
-			bus.AddHandler("test", func(query *models.GetInheritedDashboardAclQuery) error {
+			bus.AddHandler("test", func(query *models.GetDashboardAclInfoListQuery) error {
 				query.Result = mockResult
 				return nil
 			})

pkg/api/dtos/acl.go

@@ -11,6 +11,6 @@ type UpdateDashboardAclCommand struct {
 type DashboardAclUpdateItem struct {
 	UserId      int64            `json:"userId"`
 	UserGroupId int64            `json:"userGroupId"`
-	Role        m.RoleType       `json:"role"`
+	Role        *m.RoleType      `json:"role,omitempty"`
 	Permission  m.PermissionType `json:"permission"`
 }