From d9a47b7b7f306c620178a2b525970d261b0cf9a8 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Tue, 5 Jul 2016 13:02:12 -0400 Subject: [PATCH] Only filter portal jobs on the first init --- .../src/portal-mode/portal-mode-jobs.controller.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 ce890153a7..f305120e58 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 @@ -23,7 +23,7 @@ export function PortalModeJobsController($scope, $rootScope, GetBasePath, Genera $scope.iterator = list.iterator; $scope.activeFilter = 'user'; - var init = function(){ + var init = function(filter){ view.inject(list, { id: 'portal-jobs', mode: 'edit', @@ -45,8 +45,10 @@ export function PortalModeJobsController($scope, $rootScope, GetBasePath, Genera pageSize: pageSize }); $scope.search (list.iterator); - // hack to default to descending sort order - $scope.sort('job','finished'); + if(filter) { + // hack to default to descending sort order + $scope.sort('job','finished'); + } }; @@ -67,7 +69,7 @@ export function PortalModeJobsController($scope, $rootScope, GetBasePath, Genera $scope.search(list.iterator); }; - init(); + init(true); } PortalModeJobsController.$inject = ['$scope', '$rootScope', 'GetBasePath', 'generateList', 'PortalJobsList', 'SearchInit',