public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backend: Rename variables for style conformance (#29097)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-11-17 17:09:14 +01:00
committed by GitHub
parent 94840b3a58
commit 52c154a221
30 changed files with 164 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/dashboard_permission.go
+5 -5
View File
@@ -56,14 +56,14 @@ func UpdateDashboardPermissions(c *models.ReqContext, apiCmd dtos.UpdateDashboar
}
cmd := models.UpdateDashboardAclCommand{}
cmd.DashboardId = dashID
cmd.DashboardID = dashID
for _, item := range apiCmd.Items {
cmd.Items = append(cmd.Items, &models.DashboardAcl{
OrgId: c.OrgId,
DashboardId: dashID,
UserId: item.UserId,
TeamId: item.TeamId,
OrgID: c.OrgId,
DashboardID: dashID,
UserID: item.UserID,
TeamID: item.TeamID,
Role: item.Role,
Permission: item.Permission,
Created: time.Now(),
pkg/api/dashboard_permission_test.go
+5 -5
View File
@@ -31,7 +31,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
cmd := dtos.UpdateDashboardAclCommand{
Items: []dtos.DashboardAclUpdateItem{
{UserId: 1000, Permission: models.PERMISSION_ADMIN},
{UserID: 1000, Permission: models.PERMISSION_ADMIN},
},
}
@@ -69,7 +69,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
cmd := dtos.UpdateDashboardAclCommand{
Items: []dtos.DashboardAclUpdateItem{
{UserId: 1000, Permission: models.PERMISSION_ADMIN},
{UserID: 1000, Permission: models.PERMISSION_ADMIN},
},
}
@@ -121,7 +121,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
cmd := dtos.UpdateDashboardAclCommand{
Items: []dtos.DashboardAclUpdateItem{
{UserId: 1000, Permission: models.PERMISSION_ADMIN},
{UserID: 1000, Permission: models.PERMISSION_ADMIN},
},
}
@@ -154,7 +154,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
cmd := dtos.UpdateDashboardAclCommand{
Items: []dtos.DashboardAclUpdateItem{
{UserId: 1000, Permission: models.PERMISSION_ADMIN},
{UserID: 1000, Permission: models.PERMISSION_ADMIN},
},
}
@@ -188,7 +188,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
cmd := dtos.UpdateDashboardAclCommand{
Items: []dtos.DashboardAclUpdateItem{
{UserId: 1000, Permission: models.PERMISSION_ADMIN},
{UserID: 1000, Permission: models.PERMISSION_ADMIN},
},
}
pkg/api/dtos/acl.go
+2 -2
View File
@@ -7,8 +7,8 @@ type UpdateDashboardAclCommand struct {
}
type DashboardAclUpdateItem struct {
UserId int64 `json:"userId"`
TeamId int64 `json:"teamId"`
UserID int64 `json:"userId"`
TeamID int64 `json:"teamId"`
Role *models.RoleType `json:"role,omitempty"`
Permission models.PermissionType `json:"permission"`
}
pkg/api/folder_permission.go
+5 -5
View File
@@ -67,14 +67,14 @@ func UpdateFolderPermissions(c *models.ReqContext, apiCmd dtos.UpdateDashboardAc
}
cmd := models.UpdateDashboardAclCommand{}
cmd.DashboardId = folder.Id
cmd.DashboardID = folder.Id
for _, item := range apiCmd.Items {
cmd.Items = append(cmd.Items, &models.DashboardAcl{
OrgId: c.OrgId,
DashboardId: folder.Id,
UserId: item.UserId,
TeamId: item.TeamId,
OrgID: c.OrgId,
DashboardID: folder.Id,
UserID: item.UserID,
TeamID: item.TeamID,
Role: item.Role,
Permission: item.Permission,
Created: time.Now(),
pkg/api/folder_permission_test.go
+5 -5
View File
@@ -33,7 +33,7 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) {
cmd := dtos.UpdateDashboardAclCommand{
Items: []dtos.DashboardAclUpdateItem{
{UserId: 1000, Permission: models.PERMISSION_ADMIN},
{UserID: 1000, Permission: models.PERMISSION_ADMIN},
},
}
@@ -70,7 +70,7 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) {
cmd := dtos.UpdateDashboardAclCommand{
Items: []dtos.DashboardAclUpdateItem{
{UserId: 1000, Permission: models.PERMISSION_ADMIN},
{UserID: 1000, Permission: models.PERMISSION_ADMIN},
},
}
@@ -122,7 +122,7 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) {
cmd := dtos.UpdateDashboardAclCommand{
Items: []dtos.DashboardAclUpdateItem{
{UserId: 1000, Permission: models.PERMISSION_ADMIN},
{UserID: 1000, Permission: models.PERMISSION_ADMIN},
},
}
@@ -162,7 +162,7 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) {
cmd := dtos.UpdateDashboardAclCommand{
Items: []dtos.DashboardAclUpdateItem{
{UserId: 1000, Permission: models.PERMISSION_ADMIN},
{UserID: 1000, Permission: models.PERMISSION_ADMIN},
},
}
@@ -198,7 +198,7 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) {
cmd := dtos.UpdateDashboardAclCommand{
Items: []dtos.DashboardAclUpdateItem{
{UserId: 1000, Permission: models.PERMISSION_ADMIN},
{UserID: 1000, Permission: models.PERMISSION_ADMIN},
},
}