From e0a10fb9d642da787e9d1ced1037ed35c3480df6 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 30 Aug 2017 16:49:45 -0400 Subject: [PATCH 1/2] Reload the project list when we get a canceled socket message --- awx/ui/client/src/projects/list/projects-list.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/projects/list/projects-list.controller.js b/awx/ui/client/src/projects/list/projects-list.controller.js index 80aaa3702f..fe8b9b9c42 100644 --- a/awx/ui/client/src/projects/list/projects-list.controller.js +++ b/awx/ui/client/src/projects/list/projects-list.controller.js @@ -112,7 +112,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', // And we found the affected project $log.debug('Received event for project: ' + project.name); $log.debug('Status changed to: ' + data.status); - if (data.status === 'successful' || data.status === 'failed') { + if (data.status === 'successful' || data.status === 'failed' || data.status === 'canceled') { $scope.reloadList(); } else { project.scm_update_tooltip = "SCM update currently running"; From 1617700ee0035db8e37b2d8f215b666cfe7a1383 Mon Sep 17 00:00:00 2001 From: mabashian Date: Thu, 31 Aug 2017 14:42:36 -0400 Subject: [PATCH 2/2] Removed extra refresh call --- awx/ui/client/src/projects/list/projects-list.controller.js | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/ui/client/src/projects/list/projects-list.controller.js b/awx/ui/client/src/projects/list/projects-list.controller.js index fe8b9b9c42..9ce0f5b807 100644 --- a/awx/ui/client/src/projects/list/projects-list.controller.js +++ b/awx/ui/client/src/projects/list/projects-list.controller.js @@ -220,7 +220,6 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert', Rest.post() .success(function () { Alert(i18n._('SCM Update Cancel'), i18n._('Your request to cancel the update was submitted to the task manager.'), 'alert-info'); - $scope.refresh(); }) .error(function (data, status) { ProcessErrors($scope, data, status, null, { hdr: i18n._('Error!'), msg: i18n.sprintf(i18n._('Call to %s failed. POST status: '), url) + status });