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

Merge pull request #2034 from kialam/fix/1884-scm-creds-filter

Browse Source 
Fix Project SCM cred lookup
This commit is contained in:
kialam
2018-06-07 14:15:20 -04:00
committed by GitHub
parent 2e82347769 6fee8c699d
commit 1b45e8b825
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/shared/smart-search/smart-search.controller.js
View File

@@ -235,10 +235,14 @@ function SmartSearchController (
}; };
$scope.clearAllTerms = () => { $scope.clearAllTerms = () => {
_.forOwn(defaults, (value, key) => {
// preserve the `credential_type` queryset param if it exists
if (key === 'credential_type') {
defaults[key] = queryset[key];
}
});
const cleared = _(defaults).omit(_.isNull).value(); const cleared = _(defaults).omit(_.isNull).value();
delete cleared.page; delete cleared.page;
queryset = cleared; queryset = cleared;
if (!$scope.querySet) { if (!$scope.querySet) {

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

@@ -880,7 +880,11 @@ function($injector, $stateExtender, $log, i18n) {
$stateParams[`${list.iterator}_search`].role_level = "admin_role"; $stateParams[`${list.iterator}_search`].role_level = "admin_role";
$stateParams[`${list.iterator}_search`].credential_type = InsightsCredTypePK.toString() ; $stateParams[`${list.iterator}_search`].credential_type = InsightsCredTypePK.toString() ;
} }
if(list.iterator === 'credential') {
if($state.current.name.includes('projects.edit') || $state.current.name.includes('projects.add')) {
state.params[`${list.iterator}_search`].value = _.merge(state.params[`${list.iterator}_search`].value, $stateParams[`${list.iterator}_search`]);
}
}
return qs.search(path, $stateParams[`${list.iterator}_search`]); return qs.search(path, $stateParams[`${list.iterator}_search`]);
} }