External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Display roles for organization listed when using non-English web browser (#11762)

Browse Source 
Display roles for organization listed when using non-English web browser
This commit is contained in:
Kersom
2022-02-21 15:53:32 -05:00
committed by GitHub
parent aae2e3f835
commit 7cf0523561
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
awx/ui/src/components/ResourceAccessList/ResourceAccessList.js
View File

@@ -56,31 +56,29 @@ function ResourceAccessList({ apiModel, resource }) {
let orgRoles; let orgRoles;
if (location.pathname.includes('/organizations')) { if (location.pathname.includes('/organizations')) {
const { const [
data: { results: roles }, {
} = await RolesAPI.read({ content_type__isnull: true }); data: { results: systemAdmin },
const sysAdmin = roles.filter( },
(role) => role.name === 'System Administrator' {
); data: { results: systemAuditor },
const sysAud = roles.filter((role) => { },
let auditor; ] = await Promise.all([
if (role.name === 'System Auditor') { RolesAPI.read({ singleton_name: 'system_administrator' }),
auditor = role.id; RolesAPI.read({ singleton_name: 'system_auditor' }),
} ]);
return auditor;
});
orgRoles = Object.values(resource.summary_fields.object_roles).map( orgRoles = Object.entries(resource.summary_fields.object_roles).map(
(opt) => { ([key, value]) => {
let item; if (key === 'admin_role') {
if (opt.name === 'Admin') { return [`${value.id}, ${systemAdmin[0].id}`, value.name];
item = [`${opt.id}, ${sysAdmin[0].id}`, opt.name];
} else if (sysAud[0].id && opt.name === 'Auditor') {
item = [`${sysAud[0].id}, ${opt.id}`, opt.name];
} else {
item = [`${opt.id}`, opt.name];
} }
return item;
if (key === 'auditor_role') {
return [`${value.id}, ${systemAuditor[0].id}`, value.name];
}
return [`${value.id}`, value.name];
} }
); );
} }