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

fix team, credential, and workflow copy regressions

Browse Source
This commit is contained in:
Jake McDermott 2018-04-04 23:55:53 -04:00
parent 939666f172
commit 01d9c8546e
No known key found for this signature in database
GPG Key ID: 3B02CAD476EECB35
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ function CredentialsResolve ($q, $stateParams, Me, Credential, CredentialType, O
const id = $stateParams.credential_id;
const promises = {
me: new Me('get').then((me) => me.extend('admin_of_organizations'))
me: new Me('get').then((me) => me.extend('get', 'admin_of_organizations'))
};
if (!id) {

4
awx/ui/client/features/output/index.js
View File

@ -80,10 +80,10 @@ function resolveResource (
const promises = [model.getStats()];
if (model.has('related.labels')) {
promises.push(model.extend('labels'));
promises.push(model.extend('get', 'labels'));
}
promises.push(model.extend(related, config));
promises.push(model.extend('get', related, config));
return Promise.all(promises);
})

4
awx/ui/client/lib/models/Base.js
View File

@ -353,8 +353,8 @@ function has (method, keys) {
return value !== undefined && value !== null;
}
function extend (related, config = {}) {
const req = this.parseRequestConfig('GET', config);
function extend (method, related, config = {}) {
const req = this.parseRequestConfig(method.toUpperCase(), config);
if (_.get(config, 'params.page_size')) {
this.page.size = config.params.page_size;