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

Update pr based on feedback

Browse Source
This commit is contained in:
Marliana Lara 2018-03-19 13:43:27 -04:00
parent 01d35ea9c0
commit 2ae02fda82
No known key found for this signature in database
GPG Key ID: 38C73B40DFA809EE
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/features/credentials/edit-credentials.controller.js
View File

@ -1,7 +1,7 @@
function EditCredentialsController (models, $state, $scope, strings, componentsStrings) {
const vm = this || {};
const { me, credential, credentialType, organization } = models;
const { me, credential, credentialType, organization, isOrgCredAdmin } = models;
const omit = ['user', 'team', 'inputs'];
const isEditable = credential.isEditable();
@ -43,11 +43,11 @@ function EditCredentialsController (models, $state, $scope, strings, componentsS
}
const isOrgAdmin = _.some(me.get('related.admin_of_organizations.results'), (org) => org.id === organization.get('id'));
const isOrgCredentialAdmin = organization.search({ role_level: 'credential_admin_role' }).then((data) => data);
const isSuperuser = me.get('is_superuser');
const isCurrentAuthor = Boolean(credential.get('summary_fields.created_by.id') === me.get('id'));
vm.form.organization._disabled = true;
if (isSuperuser || isOrgAdmin || isOrgCredentialAdmin || (credential.get('organization') === null && isCurrentAuthor)) {
if (isSuperuser || isOrgAdmin || isOrgCredAdmin || (credential.get('organization') === null && isCurrentAuthor)) {
vm.form.organization._disabled = false;
}

2
awx/ui/client/features/credentials/index.js
View File

@ -33,11 +33,13 @@ function CredentialsResolve ($q, $stateParams, Me, Credential, CredentialType, O
credentialType: new CredentialType('get', typeId),
organization: new Organization('get', orgId)
};
dependents.isOrgCredAdmin = dependents.organization.then((org) => org.search({ role_level: 'credential_admin_role' }));
return $q.all(dependents)
.then(related => {
models.credentialType = related.credentialType;
models.organization = related.organization;
models.isOrgCredAdmin = related.isOrgCredAdmin;
return models;
});