diff --git a/awx/ui/static/js/controllers/Inventories.js b/awx/ui/static/js/controllers/Inventories.js index f042f15d8f..9bad5b65df 100644 --- a/awx/ui/static/js/controllers/Inventories.js +++ b/awx/ui/static/js/controllers/Inventories.js @@ -55,8 +55,10 @@ function InventoriesList ($scope, $rootScope, $location, $log, $routeParams, Res if ($routeParams['inventory_sources_with_failures']) { // pass a value of true, however this field actually contains an integer value scope[InventoryList.iterator + 'InputDisable'] = true; + scope[InventoryList.iterator + 'SearchValue'] = $routeParams['inventory_sources_with_failures']; scope[InventoryList.iterator + 'SearchField'] = 'inventory_sources_with_failures'; scope[InventoryList.iterator + 'SearchFieldLabel'] = InventoryList.fields['inventory_sources_with_failures'].label; + scope[InventoryList.iterator + 'SearchType'] = 'gtzero'; } scope.search(list.iterator); diff --git a/awx/ui/static/js/controllers/Projects.js b/awx/ui/static/js/controllers/Projects.js index b2cf9e1a99..62da023138 100644 --- a/awx/ui/static/js/controllers/Projects.js +++ b/awx/ui/static/js/controllers/Projects.js @@ -99,6 +99,12 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest, break; } } + } + else if ($routeParams['status']) { + scope[list.iterator + 'SearchValue'] = $routeParams['status']; + scope[list.iterator + 'SearchField'] = 'status'; + scope[list.iterator + 'SearchFieldLabel'] = list.fields['status'].label; + scope[list.iterator + 'SearchSelectValue'] = null; } scope.search(list.iterator); }); diff --git a/awx/ui/static/js/helpers/search.js b/awx/ui/static/js/helpers/search.js index d5583100ce..c92bf72e99 100644 --- a/awx/ui/static/js/helpers/search.js +++ b/awx/ui/static/js/helpers/search.js @@ -389,7 +389,8 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper']) else { if ( (!list.fields[scope[iterator + 'SearchField' + modifier]].searchType) || (list.fields[scope[iterator + 'SearchField' + modifier]].searchType && - list.fields[scope[iterator + 'SearchField' + modifier]].searchType !== 'or') ) { + list.fields[scope[iterator + 'SearchField' + modifier]].searchType !== 'or' && + list.fields[scope[iterator + 'SearchField' + modifier]].searchType !== 'gtzero') ) { scope[iterator + 'SearchParams'] += escape(scope[iterator + 'SearchValue' + modifier]); } } diff --git a/awx/ui/static/js/widgets/JobStatus.js b/awx/ui/static/js/widgets/JobStatus.js index e24007fa50..533c095e33 100644 --- a/awx/ui/static/js/widgets/JobStatus.js +++ b/awx/ui/static/js/widgets/JobStatus.js @@ -68,7 +68,7 @@ angular.module('JobStatusWidget', ['RestServices', 'Utilities']) label: 'Groups', link: '/#/home/groups', count: [(dashboard.groups && dashboard.groups.total) ? dashboard.groups.total : 0], - fail: [(dashboard.groups && dashboard.groups.fob_failed) ? dashboard.groups.job_failed : 0], + fail: [(dashboard.groups && dashboard.groups.job_failed) ? dashboard.groups.job_failed : 0], fail_link: '/#/home/groups/?has_active_failures=true' }); html += makeRow({ diff --git a/awx/ui/static/js/widgets/SCMSyncStatus.js b/awx/ui/static/js/widgets/SCMSyncStatus.js index e9ce8cb04e..81506279c2 100644 --- a/awx/ui/static/js/widgets/SCMSyncStatus.js +++ b/awx/ui/static/js/widgets/SCMSyncStatus.js @@ -51,7 +51,7 @@ angular.module('SCMSyncStatusWidget', ['RestServices', 'Utilities']) link: '/#/projects', count: [(dashboard.projects && dashboard.projects.total) ? dashboard.projects.total : 0], fail: [(dashboard.projects && dashboard.projects.failed) ? dashboard.projects.failed : 0], - fail_link: '/#/projects/?scm_type=&status=failed' + fail_link: '/#/projects/?status=failed' }); var labelList = []; diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index 132017e56f..ffd606e54f 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -137,7 +137,7 @@