External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-18 03:30:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

fixing inventory scripts AS

Browse Source
This commit is contained in:
jaredevantabor
2017-02-01 21:58:51 -08:00
parent fff8564bee
commit d4134aabe3
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/activity-stream/activitystream.route.js
View File

@@ -49,6 +49,16 @@ export default {
function(list, qs, $stateParams, GetBasePath) { function(list, qs, $stateParams, GetBasePath) {
let path = GetBasePath(list.basePath) || GetBasePath(list.name); let path = GetBasePath(list.basePath) || GetBasePath(list.name);
let stateParams = $stateParams[`${list.iterator}_search`]; 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 // 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. // these out. This should only be null when hitting the All Activity page.
if(stateParams.or__object1__in && stateParams.or__object1__in === null) { if(stateParams.or__object1__in && stateParams.or__object1__in === null) {

4
awx/ui/client/src/notifications/main.js
View File

@@ -79,10 +79,6 @@ angular.module('notifications', [
] ]
} }
}, },
data: {
activityStream: true,
activityStreamTarget: 'notification'
},
ncyBreadcrumb: { ncyBreadcrumb: {
parent: 'setup', parent: 'setup',
label: N_('NOTIFICATIONS') label: N_('NOTIFICATIONS')