From 0d089b8cbf26fb4ea6fa0a7ae66d1e5db1d7ad2c Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 13 Jul 2018 16:17:55 -0700 Subject: [PATCH] Subscribes the Sources list to both the inventory group for pending deletes It was subscribed to the jobs group, for source sync updates, but now it is subscribed to that group and the inventory group for pending deletes. --- .../src/inventories-hosts/inventories/inventories.route.js | 2 +- .../inventories/list/inventory-list.controller.js | 2 +- .../inventories/related/sources/list/sources-list.route.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/inventories.route.js b/awx/ui/client/src/inventories-hosts/inventories/inventories.route.js index fc2888a2eb..2fb8425009 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/inventories.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/inventories.route.js @@ -12,7 +12,7 @@ export default { activityStreamTarget: 'inventory', socket: { "groups": { - "inventories": ["status_changed"] + inventories: ["status_changed"] } } }, diff --git a/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js index a63fe5731f..6b5eb6b040 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js +++ b/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js @@ -164,7 +164,7 @@ function InventoriesList($scope, } if (parseInt($state.params.inventory_id) === data.inventory_id || parseInt($state.params.smartinventory_id) === data.inventory_id) { - $state.go("^", reloadListStateParams, {reload: true}); + $state.go("inventories", reloadListStateParams, {reload: true}); } else { $state.go('.', reloadListStateParams, {reload: true}); } diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js index c9d9882581..0bc50c9e75 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js @@ -17,7 +17,8 @@ export default { data: { socket: { groups: { - jobs: ["status_changed"] + jobs: ["status_changed"], + inventories: ["status_changed"] } } },