External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 19:10:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6461 from jakemcdermott/6433-fix-org-team-rbac-save

Browse Source 
Don't show user-only roles for teams

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-03-30 16:05:20 +00:00 committed by GitHub
commit 3bbd03732b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui_next/src/components/AddRole/AddResourceRole.jsx
View File

@ -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: (
<SelectRoleStep
onRolesClick={this.handleRoleCheckboxClick}
roles={roles}
roles={selectableRoles}
selectedListKey={selectedResource === 'users' ? 'username' : 'name'}
selectedListLabel={i18n._(t`Selected`)}
selectedResourceRows={selectedResourceRows}