From d4134aabe3485af38472f95a5fb8fbea66d92cce Mon Sep 17 00:00:00 2001 From: jaredevantabor Date: Wed, 1 Feb 2017 21:58:51 -0800 Subject: [PATCH] fixing inventory scripts AS --- .../client/src/activity-stream/activitystream.route.js | 10 ++++++++++ awx/ui/client/src/notifications/main.js | 4 ---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/activity-stream/activitystream.route.js b/awx/ui/client/src/activity-stream/activitystream.route.js index 5b99ce55bd..cbd9341af8 100644 --- a/awx/ui/client/src/activity-stream/activitystream.route.js +++ b/awx/ui/client/src/activity-stream/activitystream.route.js @@ -49,6 +49,16 @@ export default { function(list, qs, $stateParams, GetBasePath) { let path = GetBasePath(list.basePath) || GetBasePath(list.name); let stateParams = $stateParams[`${list.iterator}_search`]; + + if($stateParams.target === "inventory_script"){ + stateParams.or__object1__in = 'custom_inventory_script'; + stateParams.or__object2__in = 'custom_inventory_script'; + if(stateParams.inventory_script){ + stateParams.custom_inventory_script = stateParams.inventory_script; + delete stateParams.inventory_script; + } + } + // Sending or__object1__in=null will result in an api error response so lets strip // these out. This should only be null when hitting the All Activity page. if(stateParams.or__object1__in && stateParams.or__object1__in === null) { diff --git a/awx/ui/client/src/notifications/main.js b/awx/ui/client/src/notifications/main.js index ce0d04429d..58f6e59689 100644 --- a/awx/ui/client/src/notifications/main.js +++ b/awx/ui/client/src/notifications/main.js @@ -79,10 +79,6 @@ angular.module('notifications', [ ] } }, - data: { - activityStream: true, - activityStreamTarget: 'notification' - }, ncyBreadcrumb: { parent: 'setup', label: N_('NOTIFICATIONS')