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

Activity Stream

Browse Source 
Fixed system event query. API reuqest for system events now includs 'actor__isnull=true'.
This commit is contained in:
Chris Houseknecht
2014-08-27 13:11:32 -04:00
parent be999edef9
commit 6ebc5d6dfc
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/static/js/helpers/search.js
View File

@@ -401,6 +401,9 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
} else if (list.fields[scope[iterator + 'SearchField' + modifier]].searchType && } else if (list.fields[scope[iterator + 'SearchField' + modifier]].searchType &&
list.fields[scope[iterator + 'SearchField' + modifier]].searchType === 'gtzero') { list.fields[scope[iterator + 'SearchField' + modifier]].searchType === 'gtzero') {
scope[iterator + 'SearchParams'] += 'gt=0'; 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') && } else if ( (list.fields[scope[iterator + 'SearchField' + modifier]].searchType === 'select') &&
Empty(scope[iterator + 'SearchSelectValue' + modifier].value) && !/\_\_$/.test(scope[iterator + 'SearchParams']) ) { Empty(scope[iterator + 'SearchSelectValue' + modifier].value) && !/\_\_$/.test(scope[iterator + 'SearchParams']) ) {
scope[iterator + 'SearchParams'] += '=iexact='; scope[iterator + 'SearchParams'] += '=iexact=';

6
awx/ui/static/js/lists/Streams.js
View File

@@ -47,12 +47,10 @@ angular.module('StreamListDefinition', [])
searchable: false, searchable: false,
columnClass: 'col-lg-7' columnClass: 'col-lg-7'
}, },
system_event: { actor: {
label: 'System event', label: 'System event',
searchOnly: true, searchOnly: true,
searchType: 'isnull', searchType: 'isnull',
sourceModel: 'actor',
sourceField: 'username',
searchWidget: 1 searchWidget: 1
}, },
@@ -264,5 +262,5 @@ angular.module('StreamListDefinition', [])
dataPlacement: 'top' dataPlacement: 'top'
} }
} }
}); });