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

Merge pull request #5630 from jakemcdermott/fix-5586

Browse Source 
Use summary `object_roles` to lookup admin role id

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-01-13 17:05:02 +00:00
committed by GitHub
parent 200be3297a cf9f00ab86
commit 04576af6a5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/organizations/linkout/addUsers/addUsers.controller.js
View File

@@ -26,11 +26,9 @@ function($scope, $rootScope, ProcessErrors, GetBasePath, generateList,
let notAdminAlreadyParams = {}; let notAdminAlreadyParams = {};
if ($scope.addType === 'Administrators') { if ($scope.addType === 'Administrators') {
Rest.setUrl(GetBasePath('organizations') + `${$state.params.organization_id}/object_roles`); Rest.setUrl(GetBasePath('organizations') + `${$state.params.organization_id}`);
Rest.get().then(({data}) => { Rest.get().then(({data}) => {
notAdminAlreadyParams.not__roles = data.results notAdminAlreadyParams.not__roles = data.summary_fields.object_roles.admin_role.id;
.filter(({name}) => name === i18n._('Admin'))
.map(({id}) => id)[0];
init(); init();
}); });
} else { } else {