Fix inconsistencies in variable names for struct methods (#13561)

model/role.go

@@ -49,15 +49,15 @@ type RolePatch struct {
 	Permissions *[]string `json:"permissions"`
 }
 
-func (role *Role) ToJson() string {
-	b, _ := json.Marshal(role)
+func (r *Role) ToJson() string {
+	b, _ := json.Marshal(r)
 	return string(b)
 }
 
 func RoleFromJson(data io.Reader) *Role {
-	var role *Role
-	json.NewDecoder(data).Decode(&role)
-	return role
+	var r *Role
+	json.NewDecoder(data).Decode(&r)
+	return r
 }
 
 func RoleListToJson(r []*Role) string {
@@ -82,9 +82,9 @@ func RolePatchFromJson(data io.Reader) *RolePatch {
 	return rolePatch
 }
 
-func (o *Role) Patch(patch *RolePatch) {
+func (r *Role) Patch(patch *RolePatch) {
 	if patch.Permissions != nil {
-		o.Permissions = *patch.Permissions
+		r.Permissions = *patch.Permissions
 	}
 }
 
@@ -123,28 +123,28 @@ func PermissionsChangedByPatch(role *Role, patch *RolePatch) []string {
 	return result
 }
 
-func (role *Role) IsValid() bool {
-	if len(role.Id) != 26 {
+func (r *Role) IsValid() bool {
+	if len(r.Id) != 26 {
 		return false
 	}
 
-	return role.IsValidWithoutId()
+	return r.IsValidWithoutId()
 }
 
-func (role *Role) IsValidWithoutId() bool {
-	if !IsValidRoleName(role.Name) {
+func (r *Role) IsValidWithoutId() bool {
+	if !IsValidRoleName(r.Name) {
 		return false
 	}
 
-	if len(role.DisplayName) == 0 || len(role.DisplayName) > ROLE_DISPLAY_NAME_MAX_LENGTH {
+	if len(r.DisplayName) == 0 || len(r.DisplayName) > ROLE_DISPLAY_NAME_MAX_LENGTH {
 		return false
 	}
 
-	if len(role.Description) > ROLE_DESCRIPTION_MAX_LENGTH {
+	if len(r.Description) > ROLE_DESCRIPTION_MAX_LENGTH {
 		return false
 	}
 
-	for _, permission := range role.Permissions {
+	for _, permission := range r.Permissions {
 		permissionValidated := false
 		for _, p := range ALL_PERMISSIONS {
 			if permission == p.Id {