From 6ebc5d6dfcbb5824923c9860a743b757e1489ff8 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Wed, 27 Aug 2014 13:11:32 -0400 Subject: [PATCH] Activity Stream Fixed system event query. API reuqest for system events now includs 'actor__isnull=true'. --- awx/ui/static/js/helpers/search.js | 3 +++ awx/ui/static/js/lists/Streams.js | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/awx/ui/static/js/helpers/search.js b/awx/ui/static/js/helpers/search.js index b8bdb75359..8ed54c0644 100644 --- a/awx/ui/static/js/helpers/search.js +++ b/awx/ui/static/js/helpers/search.js @@ -401,6 +401,9 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper']) } else if (list.fields[scope[iterator + 'SearchField' + modifier]].searchType && list.fields[scope[iterator + 'SearchField' + modifier]].searchType === 'gtzero') { scope[iterator + 'SearchParams'] += 'gt=0'; + } else if (list.fields[scope[iterator + 'SearchField' + modifier]].searchType && + list.fields[scope[iterator + 'SearchField' + modifier]].searchType === 'isnull') { + scope[iterator + 'SearchParams'] += 'isnull='; } else if ( (list.fields[scope[iterator + 'SearchField' + modifier]].searchType === 'select') && Empty(scope[iterator + 'SearchSelectValue' + modifier].value) && !/\_\_$/.test(scope[iterator + 'SearchParams']) ) { scope[iterator + 'SearchParams'] += '=iexact='; diff --git a/awx/ui/static/js/lists/Streams.js b/awx/ui/static/js/lists/Streams.js index 2afd7d5e08..480c17eec2 100644 --- a/awx/ui/static/js/lists/Streams.js +++ b/awx/ui/static/js/lists/Streams.js @@ -47,12 +47,10 @@ angular.module('StreamListDefinition', []) searchable: false, columnClass: 'col-lg-7' }, - system_event: { + actor: { label: 'System event', searchOnly: true, searchType: 'isnull', - sourceModel: 'actor', - sourceField: 'username', searchWidget: 1 }, @@ -264,5 +262,5 @@ angular.module('StreamListDefinition', []) dataPlacement: 'top' } } - + }); \ No newline at end of file