From e2288f81b6a5e93b67426758ef9b0e6e3ef21838 Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Tue, 17 Jan 2017 14:17:16 -0800
Subject: [PATCH] fixing filter and sockets for portal jobs

---
 .../portal-mode/portal-mode-jobs.controller.js   | 16 +++++++---------
 .../client/src/portal-mode/portal-mode.route.js  |  8 ++++++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
index 6f7f5380f5..71e1747a8d 100644
--- a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
+++ b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
@@ -9,27 +9,25 @@ export function PortalModeJobsController($scope, $rootScope, $state, $stateParam
     var list = PortalJobsList;
 
     $scope.$on('ws-jobs', function() {
-        // @issue: OLD SEARCH
-        //$scope.search('job');
-    });
-    if ($rootScope.removeJobStatusChange) {
-        $rootScope.removeJobStatusChange();
-    }
-    $rootScope.removeJobStatusChange = $rootScope.$on('JobStatusChange-portal', function() {
         $state.go('.', null, { reload: true });
     });
 
     init();
 
-    function init() {
+    function init(data) {
+        let d = (!data) ? Dataset : data;
         // search init
         $scope.list = list;
-        $scope[`${list.iterator}_dataset`] = Dataset.data;
+        $scope[`${list.iterator}_dataset`] = d.data;
         $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
 
         $scope.iterator = list.iterator;
     }
 
+    $scope.$on('filterPortalJobs', function(e, data){
+        init(data);
+    });
+
     $scope.refresh = function() {
         $state.go('.', null, {reload: true});
     };
diff --git a/awx/ui/client/src/portal-mode/portal-mode.route.js b/awx/ui/client/src/portal-mode/portal-mode.route.js
index 9f9f159085..403ace5795 100644
--- a/awx/ui/client/src/portal-mode/portal-mode.route.js
+++ b/awx/ui/client/src/portal-mode/portal-mode.route.js
@@ -47,14 +47,18 @@ export default {
                         $scope.activeFilter = 'user';
                         path = GetBasePath('jobs');
                         $stateParams.job_search.created_by = $rootScope.current_user.id;
-                        qs.search(path, $stateParams.job_search);
+                        qs.search(path, $stateParams.job_search).then((response) => {
+                            $scope.$broadcast('filterPortalJobs', response);
+                        });
                     };
 
                     $scope.filterAll = function() {
                         $scope.activeFilter = 'all';
                         delete $stateParams.job_search.created_by;
                         path = GetBasePath('jobs');
-                        qs.search(path, $stateParams.job_search);
+                        qs.search(path, $stateParams.job_search).then((response) => {
+                            $scope.$broadcast('filterPortalJobs', response);
+                        });
                     };
                 }
             ]