adding model for admin of orgs and disabling credential's org field

when appropriate

awx/ui/client/features/credentials/add-credentials.controller.js

@@ -43,8 +43,8 @@ function AddCredentialsController (models, $state, strings) {
     };
 
     vm.form.save = data => {
-        data.user = me.getSelf().id;
+        data.user = me.get('id');
-                
+
         return credential.request('post', data);
     };
 

awx/ui/client/features/credentials/edit-credentials.controller.js

@@ -45,6 +45,14 @@ function EditCredentialsController (models, $state, $scope, strings) {
         vm.form.disabled = !isEditable;
     }
 
+    let isOrgAdmin = _.some(me.get('related.admin_of_organizations.results'), (org) => {return org.id === organization.get('id');});
+    let isSuperuser = me.get('is_superuser');
+    let isCurrentAuthor = Boolean(credential.get('summary_fields.created_by.id') === me.get('id'));
+    vm.form.organization._disabled = true;
+    if(isSuperuser || isOrgAdmin || (credential.get('organization') === null && isCurrentAuthor)){
+        vm.form.organization._disabled = false;
+    }
+
     vm.form.organization._resource = 'organization';
     vm.form.organization._model = organization;
     vm.form.organization._route = 'credentials.edit.organization';
@@ -75,12 +83,12 @@ function EditCredentialsController (models, $state, $scope, strings) {
     };
 
     /**
-     * If a credential's `credential_type` is changed while editing, the inputs associated with 
+     * If a credential's `credential_type` is changed while editing, the inputs associated with
-     * the old type need to be cleared before saving the inputs associated with the new type. 
+     * the old type need to be cleared before saving the inputs associated with the new type.
      * Otherwise inputs are merged together making the request invalid.
      */
     vm.form.save = data => {
-        data.user = me.getSelf().id;
+        data.user = me.get('id');
         credential.unset('inputs');
 
         return credential.request('put', data);

awx/ui/client/features/credentials/index.js

@@ -3,18 +3,19 @@ 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, OrgAdmin) {
+function CredentialsResolve ($q, $stateParams, Me, Credential, CredentialType, Organization) {
     let id = $stateParams.credential_id;
 
     let promises = {
-        me: new Me('get')
+        me: new Me('get').then((me) => {
+            return me.extend('get', 'admin_of_organizations');
+        })
     };
 
     if (!id) {
         promises.credential = new Credential('options');
         promises.credentialType =  new CredentialType();
         promises.organization =  new Organization();
-        promises.orgAdmin = new OrgAdmin();
 
         return $q.all(promises)
     }
@@ -25,19 +26,16 @@ 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;
                 });
@@ -50,8 +48,7 @@ CredentialsResolve.$inject = [
     'MeModel',
     'CredentialModel',
     'CredentialTypeModel',
-    'OrganizationModel',
+    'OrganizationModel'
-    'OrgAdminModel'
 ];
 
 function CredentialsConfig ($stateExtenderProvider, legacyProvider, pathProvider, stringProvider) {

awx/ui/client/lib/models/Base.js

@@ -277,9 +277,35 @@ function has (method, keys) {
     return value !== undefined && value !== null;
 }
 
+function extend (method, related) {
+    if (!related) {
+        related = method
+        method = 'GET'
+    } else {
+        method = method.toUpperCase()
+    }
+
+    if (this.has(method, `related.${related}`)) {
+        let id = this.get('id')
+
+        let req = {
+            method,
+            url: this.get(`related.${related}`)
+        };
+
+        return $http(req)
+            .then(({data}) => {
+                this.set(method, `related.${related}`, data);
+                return this;
+            })
+    }
+
+    return Promise.reject(new Error(`No related property, ${related}, exists`));
+}
+
 function normalizePath (resource) {
     let version = '/api/v2/';
-    
+
     return `${version}${resource}/`;
 }
 
@@ -383,6 +409,7 @@ function BaseModel (path, settings) {
     this.search = search;
     this.set = set;
     this.unset = unset;
+    this.extend = extend;
 
     this.http = {
         get: httpGet.bind(this),

awx/ui/client/lib/models/Me.js

@@ -1,16 +1,19 @@
 let BaseModel;
 
-function getSelf () {
-    return this.get('results[0]');
-}
-
 function MeModel (method, resource, graft) {
     BaseModel.call(this, 'me');
 
     this.Constructor = MeModel;
-    this.getSelf = getSelf.bind(this);
 
-    return this.create(method, resource, graft);
+    return this.create(method, resource, graft)
+        .then(() => {
+            if (this.has('results')) {
+                _.merge(this.model.GET, this.get('results[0]'));
+                this.unset('results');
+            }
+
+             return this;
+        });
 }
 
 function MeModelLoader (_BaseModel_) {

awx/ui/client/lib/models/OrgAdmin.js

@@ -1,19 +0,0 @@
-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;

awx/ui/client/lib/models/index.js

@@ -4,7 +4,6 @@ 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', [])
@@ -13,5 +12,4 @@ angular
     .service('CredentialModel', Credential)
     .service('CredentialTypeModel', CredentialType)
     .service('MeModel', Me)
-    .service('OrganizationModel', Organization)
+    .service('OrganizationModel', Organization);
-    .service('OrgAdminModel', OrgAdmin);