mirror of https://github.com/coder/coder.git
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
This commit is contained in:
parent
e5198a25a6
commit
88605b9d01
|
@ -143,7 +143,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
|
||||||
|
|
||||||
memberRole := Role{
|
memberRole := Role{
|
||||||
Name: member,
|
Name: member,
|
||||||
DisplayName: "",
|
DisplayName: "Member",
|
||||||
Site: Permissions(map[string][]Action{
|
Site: Permissions(map[string][]Action{
|
||||||
ResourceRoleAssignment.Type: {ActionRead},
|
ResourceRoleAssignment.Type: {ActionRead},
|
||||||
// All users can see the provisioner daemons.
|
// All users can see the provisioner daemons.
|
||||||
|
|
|
@ -58,7 +58,10 @@ func (api *API) assignableOrgRoles(rw http.ResponseWriter, r *http.Request) {
|
||||||
func assignableRoles(actorRoles rbac.ExpandableRoles, roles []rbac.Role) []codersdk.AssignableRoles {
|
func assignableRoles(actorRoles rbac.ExpandableRoles, roles []rbac.Role) []codersdk.AssignableRoles {
|
||||||
assignable := make([]codersdk.AssignableRoles, 0)
|
assignable := make([]codersdk.AssignableRoles, 0)
|
||||||
for _, role := range roles {
|
for _, role := range roles {
|
||||||
if role.DisplayName == "" {
|
// The member role is implied, and not assignable.
|
||||||
|
// If there is no display name, then the role is also unassigned.
|
||||||
|
// This is not the ideal logic, but works for now.
|
||||||
|
if role.Name == rbac.RoleMember() || (role.DisplayName == "") {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
assignable = append(assignable, codersdk.AssignableRoles{
|
assignable = append(assignable, codersdk.AssignableRoles{
|
||||||
|
|
Loading…
Reference in New Issue