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

Fixed bug where empty searches were hiding the results and attempting to filter without a selected task threw an error

Browse Source
This commit is contained in:
Michael Abashian
2016-07-05 15:25:04 -04:00
parent 9e0f01a29f
commit ea170f4fe6
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
awx/ui/client/src/job-detail/host-summary/host-summary.controller.js
View File

@@ -99,16 +99,18 @@
} }
}; };
$scope.search = function(){ $scope.search = function(){
$scope.searchActive = true; if($scope.searchTerm && $scope.searchTerm !== '') {
Wait('start'); $scope.searchActive = true;
JobDetailService.getJobHostSummaries($stateParams.id, { Wait('start');
page_size: page_size, JobDetailService.getJobHostSummaries($stateParams.id, {
host_name__icontains: $scope.searchTerm, page_size: page_size,
}).success(function(res){ host_name__icontains: $scope.searchTerm,
$scope.hosts = res.results; }).success(function(res){
$scope.next = res.next; $scope.hosts = res.results;
Wait('stop'); $scope.next = res.next;
}); Wait('stop');
});
}
}; };
$scope.clearSearch = function(){ $scope.clearSearch = function(){
$scope.searchActive = false; $scope.searchActive = false;

12
awx/ui/client/src/job-detail/job-detail.controller.js
View File

@@ -156,6 +156,10 @@ export default
scope.search_task_status = 'all'; scope.search_task_status = 'all';
scope.search_host_status = 'all'; scope.search_host_status = 'all';
scope.search_play_name = '';
scope.search_task_name = '';
scope.search_host_name = '';
scope.haltEventQueue = false; scope.haltEventQueue = false;
scope.processing = false; scope.processing = false;
scope.lessStatus = false; scope.lessStatus = false;
@@ -869,7 +873,7 @@ export default
else { else {
scope.searchHostsEnabled = true; scope.searchHostsEnabled = true;
} }
if (!scope.liveEventProcessing || scope.pauseLiveEvents) { if ((!scope.liveEventProcessing || scope.pauseLiveEvents) && scope.selectedTask) {
scope.hostResultsLoading = true; scope.hostResultsLoading = true;
params = { params = {
parent: scope.selectedTask, parent: scope.selectedTask,
@@ -888,6 +892,12 @@ export default
} }
}; };
scope.searchHostsKeyPress = function(e) {
if (e.keyCode === 13) {
scope.searchHosts();
e.stopPropagation();
}
};
if (scope.removeDeleteFinished) { if (scope.removeDeleteFinished) {
scope.removeDeleteFinished(); scope.removeDeleteFinished();