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

adding org-admin check for projects and teams

Browse Source
This commit is contained in:
Jared Tabor 2017-08-24 17:26:56 -04:00
parent 5501d42de0
commit ec4877f10b
5 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ import AddController from './add-credentials.controller';
import EditController from './edit-credentials.controller';
import CredentialsStrings from './credentials.strings'
function CredentialsResolve ($q, $stateParams, Me, Credential, CredentialType, Organization) {
function CredentialsResolve ($q, $stateParams, Me, Credential, CredentialType, Organization, OrgAdmin) {
let id = $stateParams.credential_id;
let promises = {
@ -14,6 +14,7 @@ function CredentialsResolve ($q, $stateParams, Me, Credential, CredentialType, O
promises.credential = new Credential('options');
promises.credentialType = new CredentialType();
promises.organization = new Organization();
promises.orgAdmin = new OrgAdmin();
return $q.all(promises)
}
@ -24,16 +25,19 @@ function CredentialsResolve ($q, $stateParams, Me, Credential, CredentialType, O
.then(models => {
let typeId = models.credential.get('credential_type');
let orgId = models.credential.get('organization');
let userId = models.me.get('results')[0].id;
let dependents = {
credentialType: new CredentialType('get', typeId),
organization: new Organization('get', orgId)
organization: new Organization('get', orgId),
orgAdmin: new OrgAdmin('get', userId)
};
return $q.all(dependents)
.then(related => {
models.credentialType = related.credentialType;
models.organization = related.organization;
models.is_org_admin = related.orgAdmin;
return models;
});
@ -46,7 +50,8 @@ CredentialsResolve.$inject = [
'MeModel',
'CredentialModel',
'CredentialTypeModel',
'OrganizationModel'
'OrganizationModel',
'OrgAdminModel'
];
function CredentialsConfig ($stateExtenderProvider, legacyProvider, pathProvider, stringProvider) {

19
awx/ui/client/lib/models/OrgAdmin.js Normal file
View File

@ -0,0 +1,19 @@
let BaseModel;
function OrgAdminModel (method, resource, graft) {
BaseModel.call(this, {path: 'users', subPath: 'admin_of_organizations'});
this.Constructor = OrgAdminModel;
return this.create(method, resource, graft);
}
function OrgAdminModelLoader (_BaseModel_) {
BaseModel = _BaseModel_;
return OrgAdminModel;
}
OrgAdminModelLoader.$inject = ['BaseModel'];
export default OrgAdminModelLoader;

5
awx/ui/client/lib/models/index.js
View File

@ -4,6 +4,7 @@ import Credential from './Credential';
import CredentialType from './CredentialType';
import Me from './Me';
import Organization from './Organization';
import OrgAdmin from './OrgAdmin';
angular
.module('at.lib.models', [])
@ -12,5 +13,5 @@ angular
.service('CredentialModel', Credential)
.service('CredentialTypeModel', CredentialType)
.service('MeModel', Me)
.service('OrganizationModel', Organization);
.service('OrganizationModel', Organization)
.service('OrgAdminModel', OrgAdmin);

10
awx/ui/client/src/projects/edit/projects-edit.controller.js
View File

@ -8,11 +8,12 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
'Alert', 'ProcessErrors', 'GenerateForm', 'Prompt',
'GetBasePath', 'GetProjectPath', 'Authorization', 'GetChoices', 'Empty',
'Wait', 'ProjectUpdate', '$state', 'CreateSelect2', 'ToggleNotification',
'i18n', 'CredentialTypes',
'i18n', 'CredentialTypes', 'OrgAdminLookup',
function($scope, $rootScope, $stateParams, ProjectsForm, Rest, Alert,
ProcessErrors, GenerateForm, Prompt, GetBasePath,
GetProjectPath, Authorization, GetChoices, Empty, Wait, ProjectUpdate,
$state, CreateSelect2, ToggleNotification, i18n, CredentialTypes) {
$state, CreateSelect2, ToggleNotification, i18n, CredentialTypes,
OrgAdminLookup) {
var form = ProjectsForm(),
defaultUrl = GetBasePath('projects') + $stateParams.project_id + '/',
@ -141,6 +142,11 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
$scope.scm_type_class = "btn-disabled";
}
OrgAdminLookup.checkForAdminAccess({organization: data.organization})
.then(function(canEditOrg){
$scope.canEditOrg = canEditOrg;
});
$scope.project_obj = data;
$scope.name = data.name;
$scope.$emit('projectLoaded');

9
awx/ui/client/src/teams/edit/teams-edit.controller.js
View File

@ -5,9 +5,9 @@
*************************************************/
export default ['$scope', '$rootScope', '$stateParams', 'TeamForm', 'Rest',
'ProcessErrors', 'GetBasePath', 'Wait', '$state',
'ProcessErrors', 'GetBasePath', 'Wait', '$state', 'OrgAdminLookup',
function($scope, $rootScope, $stateParams, TeamForm, Rest, ProcessErrors,
GetBasePath, Wait, $state) {
GetBasePath, Wait, $state, OrgAdminLookup) {
var form = TeamForm,
id = $stateParams.team_id,
@ -23,6 +23,11 @@ export default ['$scope', '$rootScope', '$stateParams', 'TeamForm', 'Rest',
setScopeFields(data);
$scope.organization_name = data.summary_fields.organization.name;
OrgAdminLookup.checkForAdminAccess({organization: data.organization})
.then(function(canEditOrg){
$scope.canEditOrg = canEditOrg;
});
$scope.team_obj = data;
Wait('stop');
});