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

resolves kickback on #2841

Browse Source
This commit is contained in:
Leigh Johnson
2016-07-11 13:40:55 -04:00
parent c8b8cdf7f5
commit 0d1f5f1e54
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/lists/PortalJobs.js
View File

@@ -43,6 +43,7 @@ export default
searchable: false, searchable: false,
filter: "longDate", filter: "longDate",
key: true, key: true,
desc: true,
columnClass: "col-lg-4 col-md-4 col-sm-3" columnClass: "col-lg-4 col-md-4 col-sm-3"
} }
}, },

16
awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
View File

@@ -23,7 +23,8 @@ export function PortalModeJobsController($scope, $rootScope, GetBasePath, Genera
$scope.iterator = list.iterator; $scope.iterator = list.iterator;
$scope.activeFilter = 'user'; $scope.activeFilter = 'user';
var init = function(sort){ var init = function(url){
defaultUrl = url ? url : defaultUrl;
view.inject(list, { view.inject(list, {
id: 'portal-jobs', id: 'portal-jobs',
mode: 'edit', mode: 'edit',
@@ -44,31 +45,26 @@ export function PortalModeJobsController($scope, $rootScope, GetBasePath, Genera
url: defaultUrl, url: defaultUrl,
pageSize: pageSize pageSize: pageSize
}); });
$scope.search (list.iterator); $scope.search(list.iterator);
if(sort) {
// hack to default to descending sort order
$scope.sort('job','finished');
}
}; };
$scope.filterUser = function(){ $scope.filterUser = function(){
$scope.activeFilter = 'user'; $scope.activeFilter = 'user';
defaultUrl = GetBasePath('jobs') + '?created_by=' + $rootScope.current_user.id; defaultUrl = GetBasePath('jobs') + '?created_by=' + $rootScope.current_user.id;
init(true); init(defaultUrl);
}; };
$scope.filterAll = function(){ $scope.filterAll = function(){
$scope.activeFilter = 'all'; $scope.activeFilter = 'all';
defaultUrl = GetBasePath('jobs'); defaultUrl = GetBasePath('jobs');
init(true); init(defaultUrl);
}; };
$scope.refresh = function(){ $scope.refresh = function(){
$scope.search(list.iterator); $scope.search(list.iterator);
}; };
init(true); init();
} }
PortalModeJobsController.$inject = ['$scope', '$rootScope', 'GetBasePath', 'generateList', 'PortalJobsList', 'SearchInit', PortalModeJobsController.$inject = ['$scope', '$rootScope', 'GetBasePath', 'generateList', 'PortalJobsList', 'SearchInit',