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

resolves kickback on #2980 (#3008)

Browse Source
This commit is contained in:
Leigh Johnson
2016-07-14 23:08:02 -04:00
committed by GitHub
parent 3b972e871d
commit 73722ffb77
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/helpers/JobDetail.js
View File

@@ -687,7 +687,7 @@ export default
scope.plays = []; scope.plays = [];
url = scope.job.url + 'job_plays/?page_size=' + scope.playsMaxRows + '&order=id'; url = scope.job.url + 'job_plays/?page_size=' + scope.playsMaxRows + '&order=id';
url += (scope.search_play_name) ? '&play__icontains=' + scope.search_play_name : ''; url += (scope.search_play_name) ? '&play__icontains=' + encodeURIComponent(scope.search_play_name) : '';
url += (scope.search_play_status === 'failed') ? '&failed=true' : ''; url += (scope.search_play_status === 'failed') ? '&failed=true' : '';
scope.playsLoading = true; scope.playsLoading = true;
Rest.setUrl(url); Rest.setUrl(url);
@@ -786,7 +786,7 @@ export default
scope.tasks = []; scope.tasks = [];
if (scope.selectedPlay) { if (scope.selectedPlay) {
url = scope.job.url + 'job_tasks/?event_id=' + scope.selectedPlay; url = scope.job.url + 'job_tasks/?event_id=' + scope.selectedPlay;
url += (scope.search_task_name) ? '&task__icontains=' + scope.search_task_name : ''; url += (scope.search_task_name) ? '&task__icontains=' + encodeURIComponent(scope.search_task_name) : '';
url += (scope.search_task_status === 'failed') ? '&failed=true' : ''; url += (scope.search_task_status === 'failed') ? '&failed=true' : '';
url += '&page_size=' + scope.tasksMaxRows + '&order=id'; url += '&page_size=' + scope.tasksMaxRows + '&order=id';
scope.plays.every(function(p, idx) { scope.plays.every(function(p, idx) {

4
awx/ui/client/src/job-detail/host-events/host-events.controller.js
View File

@@ -25,8 +25,8 @@
host_name: $scope.hostName, host_name: $scope.hostName,
}; };
if ($scope.searchStr && $scope.searchStr !== ''){ if ($scope.searchStr && $scope.searchStr !== ''){
params.or__play__icontains = $scope.searchStr; params.or__play__icontains = encodeURIComponent($scope.searchStr);
params.or__task__icontains = $scope.searchStr; params.or__task__icontains = encodeURIComponent($scope.searchStr);
} }
switch($scope.activeFilter){ switch($scope.activeFilter){