From 006868339d182275cccf278e1abcde20b256a275 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Wed, 18 Nov 2020 16:16:58 +0100 Subject: [PATCH] Backend: Fix build (#29206) * Backend: Fix build Signed-off-by: Arve Knudsen --- pkg/api/dashboard_permission.go | 2 +- pkg/api/dashboard_permission_test.go | 4 ++-- pkg/api/folder_permission_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/api/dashboard_permission.go b/pkg/api/dashboard_permission.go index f3768c7386e..b89ee0dd473 100644 --- a/pkg/api/dashboard_permission.go +++ b/pkg/api/dashboard_permission.go @@ -100,7 +100,7 @@ func UpdateDashboardPermissions(c *models.ReqContext, apiCmd dtos.UpdateDashboar func validatePermissionsUpdate(apiCmd dtos.UpdateDashboardAclCommand) error { for _, item := range apiCmd.Items { - if (item.UserId > 0 || item.TeamId > 0) && item.Role != nil { + if (item.UserID > 0 || item.TeamID > 0) && item.Role != nil { return models.ErrPermissionsWithRoleNotAllowed } } diff --git a/pkg/api/dashboard_permission_test.go b/pkg/api/dashboard_permission_test.go index d9038f7bb0e..8acdee935de 100644 --- a/pkg/api/dashboard_permission_test.go +++ b/pkg/api/dashboard_permission_test.go @@ -171,12 +171,12 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) { cmds := []dtos.UpdateDashboardAclCommand{ { Items: []dtos.DashboardAclUpdateItem{ - {UserId: 1000, Permission: models.PERMISSION_ADMIN, Role: &role}, + {UserID: 1000, Permission: models.PERMISSION_ADMIN, Role: &role}, }, }, { Items: []dtos.DashboardAclUpdateItem{ - {TeamId: 1000, Permission: models.PERMISSION_ADMIN, Role: &role}, + {TeamID: 1000, Permission: models.PERMISSION_ADMIN, Role: &role}, }, }, } diff --git a/pkg/api/folder_permission_test.go b/pkg/api/folder_permission_test.go index 2397060774d..d7a8985571e 100644 --- a/pkg/api/folder_permission_test.go +++ b/pkg/api/folder_permission_test.go @@ -177,12 +177,12 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) { cmds := []dtos.UpdateDashboardAclCommand{ { Items: []dtos.DashboardAclUpdateItem{ - {UserId: 1000, Permission: models.PERMISSION_ADMIN, Role: &role}, + {UserID: 1000, Permission: models.PERMISSION_ADMIN, Role: &role}, }, }, { Items: []dtos.DashboardAclUpdateItem{ - {TeamId: 1000, Permission: models.PERMISSION_ADMIN, Role: &role}, + {TeamID: 1000, Permission: models.PERMISSION_ADMIN, Role: &role}, }, }, }