From 862dc458c6733c1d7435128bcd2424ca7518e09b Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 22 Jun 2016 19:26:28 -0700 Subject: [PATCH] fixing project view of failed syncs from dash to include failed jobs and canceled jobs --- awx/ui/client/src/controllers/Projects.js | 2 +- .../client/src/dashboard/counts/dashboard-counts.directive.js | 2 +- awx/ui/client/src/helpers/Projects.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/controllers/Projects.js b/awx/ui/client/src/controllers/Projects.js index 18b73bf80f..2348a4992e 100644 --- a/awx/ui/client/src/controllers/Projects.js +++ b/awx/ui/client/src/controllers/Projects.js @@ -22,7 +22,7 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams, Wait('start'); var list = ProjectList, - defaultUrl = GetBasePath('projects') + ($stateParams.status ? '?status=' + $stateParams.status : ''), + defaultUrl = GetBasePath('projects') + ($stateParams.status ? '?status__in=' + $stateParams.status : ''), view = GenerateList, base = $location.path().replace(/^\//, '').split('/')[0], mode = (base === 'projects') ? 'edit' : 'select', diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js b/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js index 6d6f2934f8..f3e4a0ad20 100644 --- a/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js +++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js @@ -60,7 +60,7 @@ export default label: "Projects" }, { - url: "/#/projects?status=failed", + url: "/#/projects?status=failed,canceled", number: scope.data.projects.failed, label: "Project Sync Failures", isFailureCount: true diff --git a/awx/ui/client/src/helpers/Projects.js b/awx/ui/client/src/helpers/Projects.js index 69e267b102..37f2d5823b 100644 --- a/awx/ui/client/src/helpers/Projects.js +++ b/awx/ui/client/src/helpers/Projects.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name helpers.function:Projects @@ -41,6 +41,7 @@ export default break; case 'failed': case 'missing': + case 'canceled': result = 'error'; } return result;