Commit88605b9

authored

chore: add display name to member role (#10239)

* chore: add display name to member role* Do not let member role be assignable* Ignore org member role for assignability atm

1 parente5198a2 commit88605b9Copy full SHA for 88605b9

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {`
`143`	`143`
`144`	`144`	`memberRole:=Role{`
`145`	`145`	`Name:member,`
`146`		`-DisplayName:"",`
	`146`	`+DisplayName:"Member",`
`147`	`147`	`Site:Permissions(map[string][]Action{`
`148`	`148`	`ResourceRoleAssignment.Type: {ActionRead},`
`149`	`149`	`// All users can see the provisioner daemons.`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,10 @@ func (api API) assignableOrgRoles(rw http.ResponseWriter, r http.Request) {`
`58`	`58`	`funcassignableRoles(actorRoles rbac.ExpandableRoles,roles []rbac.Role) []codersdk.AssignableRoles {`
`59`	`59`	`assignable:=make([]codersdk.AssignableRoles,0)`
`60`	`60`	`for_,role:=rangeroles {`
`61`		`-ifrole.DisplayName=="" {`
	`61`	`+// The member role is implied, and not assignable.`
	`62`	`+// If there is no display name, then the role is also unassigned.`
	`63`	`+// This is not the ideal logic, but works for now.`
	`64`	`+ifrole.Name==rbac.RoleMember()\|\| (role.DisplayName=="") {`
`62`	`65`	`continue`
`63`	`66`	`}`
`64`	`67`	`assignable=append(assignable, codersdk.AssignableRoles{`

Comments

(0)