From 6f582b5688ca866c2ded256de0ef18cbcfc5c61f Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Fri, 27 Mar 2020 11:18:15 -0400 Subject: [PATCH] Don't show user-only roles for teams --- .../src/components/AddRole/AddResourceRole.jsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx index edd33d77c0..af8fb4d9fb 100644 --- a/awx/ui_next/src/components/AddRole/AddResourceRole.jsx +++ b/awx/ui_next/src/components/AddRole/AddResourceRole.jsx @@ -142,6 +142,17 @@ class AddResourceRole extends React.Component { } = this.state; const { onClose, roles, i18n } = this.props; + // Object roles can be user only, so we remove them when + // showing role choices for team access + const selectableRoles = { ...roles }; + if (selectedResource === 'teams') { + Object.keys(roles).forEach(key => { + if (selectableRoles[key].user_only) { + delete selectableRoles[key]; + } + }); + } + const userSearchColumns = [ { name: i18n._(t`Username`), @@ -274,7 +285,7 @@ class AddResourceRole extends React.Component { component: (