From c93039c0cc0f38803bd6ba8d58de724c6e3af7bd Mon Sep 17 00:00:00 2001
From: Leigh Johnson <ljohnson@redhat.com>
Date: Thu, 26 May 2016 16:45:31 -0400
Subject: [PATCH 1/2] fix job details play/task/host filters, resolves #1673

---
 awx/ui/client/src/helpers/JobDetail.js        | 29 ++++++++++++-------
 .../src/job-detail/job-detail.controller.js   | 29 +++++++++++++++++++
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/awx/ui/client/src/helpers/JobDetail.js b/awx/ui/client/src/helpers/JobDetail.js
index df42b50328..c8cf93cf38 100644
--- a/awx/ui/client/src/helpers/JobDetail.js
+++ b/awx/ui/client/src/helpers/JobDetail.js
@@ -784,7 +784,7 @@ export default
                 url, play;
 
             scope.tasks = [];
-
+            console.log(scope)
             if (scope.selectedPlay) {
                 url = scope.job.url + 'job_tasks/?event_id=' + scope.selectedPlay;
                 url += (scope.search_task_name) ? '&task__icontains=' + scope.search_task_name : '';
@@ -912,16 +912,25 @@ export default
                     scope.tasks[idx].taskActiveClass = '';
                 }
             });
-            params = {
-                parent: scope.selectedTask,
-                event__startswith: 'runner',
-                page_size: scope.hostResultsMaxRows,
-                order: 'host_name,counter',
-            };
-            JobDetailService.getRelatedJobEvents(scope.job.id, params).success(function(res){
-                scope.hostResults = JobDetailService.processHostEvents(res.results);
+            if (scope.selectedTask !== null){
+                params = {
+                    parent: scope.selectedTask,
+                    event__startswith: 'runner',
+                    page_size: scope.hostResultsMaxRows,
+                    order: 'host_name,counter',
+                };
+                if (scope.search_host_status === 'failed'){
+                    params.failed = true;
+                }
+                JobDetailService.getRelatedJobEvents(scope.job.id, params).success(function(res){
+                    scope.hostResults = JobDetailService.processHostEvents(res.results);
+                    scope.hostResultsLoading = false;
+                });
+            }
+            else{
+                scope.hostResults = [];
                 scope.hostResultsLoading = false;
-            });
+            }
         };
     }])
 
diff --git a/awx/ui/client/src/job-detail/job-detail.controller.js b/awx/ui/client/src/job-detail/job-detail.controller.js
index 2e927fad2c..f125b3512a 100644
--- a/awx/ui/client/src/job-detail/job-detail.controller.js
+++ b/awx/ui/client/src/job-detail/job-detail.controller.js
@@ -770,6 +770,15 @@ export default
                 }
             };
 
+            scope.filterTaskStatus = function() {
+                scope.search_task_status = (scope.search_task_status === 'all') ? 'failed' : 'all';
+                if (!scope.liveEventProcessing || scope.pauseLiveEvents) {
+                    LoadTasks({
+                        scope: scope
+                    });
+                }
+            };
+
             scope.filterPlayStatus = function() {
                 scope.search_play_status = (scope.search_play_status === 'all') ? 'failed' : 'all';
                 if (!scope.liveEventProcessing || scope.pauseLiveEvents) {
@@ -779,6 +788,26 @@ export default
                 }
             };
 
+            scope.filterHostStatus = function(){
+                scope.search_host_status = (scope.search_host_status === 'all') ? 'failed' : 'all';
+                if (!scope.liveEventProcessing || scope.pauseLiveEvents){
+                    if (scope.selectedTask !== null && scope.selectedPlay !== null){
+                        var params = {
+                            parent: scope.selectedTask,
+                            page_size: scope.hostResultsMaxRows,
+                            order: 'host_name,counter',
+                        };
+                        if (scope.search_host_status === 'failed'){
+                            params.failed = true;
+                        }
+                        JobDetailService.getRelatedJobEvents(scope.job.id, params).success(function(res){
+                            scope.hostResults = JobDetailService.processHostEvents(res.results);
+                            scope.hostResultsLoading = false;
+                        });
+                    }
+                }
+            };
+
             scope.searchPlays = function() {
                 if (scope.search_play_name) {
                     scope.searchPlaysEnabled = false;

From 44ff9a02bc9b001a5197035500a5efcf4768aa39 Mon Sep 17 00:00:00 2001
From: Akita Noek <anoek@ansible.com>
Date: Tue, 31 May 2016 17:08:08 -0400
Subject: [PATCH 2/2] -console.log

---
 awx/ui/client/src/helpers/JobDetail.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/awx/ui/client/src/helpers/JobDetail.js b/awx/ui/client/src/helpers/JobDetail.js
index c8cf93cf38..1e7f5d89e7 100644
--- a/awx/ui/client/src/helpers/JobDetail.js
+++ b/awx/ui/client/src/helpers/JobDetail.js
@@ -784,7 +784,6 @@ export default
                 url, play;
 
             scope.tasks = [];
-            console.log(scope)
             if (scope.selectedPlay) {
                 url = scope.job.url + 'job_tasks/?event_id=' + scope.selectedPlay;
                 url += (scope.search_task_name) ? '&task__icontains=' + scope.search_task_name : '';