External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7146 from gconsidine/ui/fix/credential-list-with-insights

Browse Source 
Set iterator property explicitly in credentials view
This commit is contained in:
Greg Considine
2017-07-19 13:07:16 -04:00
committed by GitHub
parent 98bca3b70b cb860261fe
commit 4725eae48f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/features/credentials/legacy.credentials.js
View File

@@ -33,6 +33,7 @@ function LegacyCredentialsService (pathService) {
Dataset: ['CredentialList', 'QuerySet', '$stateParams', 'GetBasePath', Dataset: ['CredentialList', 'QuerySet', '$stateParams', 'GetBasePath',
function(list, qs, $stateParams, GetBasePath) { function(list, qs, $stateParams, GetBasePath) {
let path = GetBasePath(list.basePath) || GetBasePath(list.name); let path = GetBasePath(list.basePath) || GetBasePath(list.name);
return qs.search(path, $stateParams[`${list.iterator}_search`]); return qs.search(path, $stateParams[`${list.iterator}_search`]);
} }
], ],

5
awx/ui/client/src/shared/stateDefinitions.factory.js
View File

@@ -738,8 +738,9 @@ function($injector, $stateExtender, $log, i18n) {
}, },
resolve: { resolve: {
ListDefinition: [field.list, function(list) { ListDefinition: [field.list, function(list) {
list.iterator = field.sourceModel; let listClone = _.cloneDeep(list);
return list; listClone.iterator = field.sourceModel;
return listClone;
}], }],
OrganizationId: ['ListDefinition', 'InventoriesService', '$stateParams', '$rootScope', OrganizationId: ['ListDefinition', 'InventoriesService', '$stateParams', '$rootScope',
function(list, InventoriesService, $stateParams, $rootScope){ function(list, InventoriesService, $stateParams, $rootScope){