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

Portal Mode UX / product audit items (#1867)

Browse Source 
* finish Portal mode audit work items, resolves #1832, tracking #1335

* remove $state from injected dependencies #1872
This commit is contained in:
Leigh
2016-05-10 13:00:39 -04:00
parent 57e24551b6
commit 7a0ea53211
3 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/lists/PortalJobTemplates.js
View File

@@ -17,7 +17,7 @@ export default
hover: true, hover: true,
well: true, well: true,
searchSize: 'col-lg-8 col-md-8 col-sm-12 col-xs-12', searchSize: 'col-lg-8 col-md-8 col-sm-12 col-xs-12',
emptyListText: 'There are no job templates to display at this time',
fields: { fields: {
name: { name: {
key: true, key: true,

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

@@ -17,6 +17,7 @@ export default
well: true, well: true,
listTitle: 'Jobs', listTitle: 'Jobs',
searchSize: 'col-lg-8 col-md-8 col-sm-12 col-xs-12', searchSize: 'col-lg-8 col-md-8 col-sm-12 col-xs-12',
emptyListText: 'There are no jobs to display at this time',
fields: { fields: {
status: { status: {
@@ -32,9 +33,8 @@ export default
searchLabel: 'Status' searchLabel: 'Status'
}, },
name: { name: {
key: true,
label: 'Name', label: 'Name',
columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-6', columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-6 List-staticColumnAdjacent',
defaultSearchField: true, defaultSearchField: true,
linkTo: '/#/jobs/{{job.id}}' linkTo: '/#/jobs/{{job.id}}'
}, },
@@ -43,7 +43,7 @@ export default
noLink: true, noLink: true,
searchable: false, searchable: false,
filter: "longDate", filter: "longDate",
nosort: true, key: true,
columnClass: "col-lg-4 col-md-4 col-sm-3" columnClass: "col-lg-4 col-md-4 col-sm-3"
} }
}, },

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

@@ -4,64 +4,67 @@
* All Rights Reserved * All Rights Reserved
*************************************************/ *************************************************/
export function PortalModeJobsController($scope, $state, $rootScope, GetBasePath, GenerateList, PortalJobsList, SearchInit, export function PortalModeJobsController($scope, $rootScope, GetBasePath, GenerateList, PortalJobsList, SearchInit,
PaginateInit){ PaginateInit){
var list = PortalJobsList, var list = PortalJobsList,
view = GenerateList, view = GenerateList,
// show user jobs by default // show user jobs by default
defaultUrl = GetBasePath('jobs') + '?created_by=' + $rootScope.current_user.id, defaultUrl = GetBasePath('jobs') + '?created_by=' + $rootScope.current_user.id,
pageSize = 12; pageSize = 12;
if ($rootScope.removeJobStatusChange) { if ($rootScope.removeJobStatusChange) {
$rootScope.removeJobStatusChange(); $rootScope.removeJobStatusChange();
} }
$rootScope.removeJobStatusChange = $rootScope.$on('JobStatusChange-portal', function() { $rootScope.removeJobStatusChange = $rootScope.$on('JobStatusChange-portal', function() {
$scope.search('portal_job'); //processEvent(event); $scope.search('job');
}); });
$scope.iterator = list.iterator; $scope.iterator = list.iterator;
$scope.activeFilter = 'user'; $scope.activeFilter = 'user';
var init = function(){ var init = function(){
view.inject(list, { view.inject(list, {
id: 'portal-jobs', id: 'portal-jobs',
mode: 'edit', mode: 'edit',
scope: $scope, scope: $scope,
searchSize: 'col-md-10 col-xs-12' searchSize: 'col-md-10 col-xs-12'
}); });
SearchInit({ SearchInit({
scope: $scope, scope: $scope,
set: 'jobs', set: 'jobs',
list: list, list: list,
url: defaultUrl url: defaultUrl
}); });
PaginateInit({ PaginateInit({
scope: $scope, scope: $scope,
list: list, list: list,
url: defaultUrl, url: defaultUrl,
pageSize: pageSize pageSize: pageSize
}); });
$scope.search (list.iterator); $scope.search (list.iterator);
}; // hack to default to descending sort order
$scope.sort('job','started');
};
$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(); init();
}; };
$scope.filterAll = function(){ $scope.filterAll = function(){
$scope.activeFilter = 'all'; $scope.activeFilter = 'all';
defaultUrl = GetBasePath('jobs'); defaultUrl = GetBasePath('jobs');
init(); init();
}; };
init(); init();
} }
PortalModeJobsController.$inject = ['$scope', '$state', '$rootScope', 'GetBasePath', 'generateList', 'PortalJobsList', 'SearchInit', PortalModeJobsController.$inject = ['$scope', '$rootScope', 'GetBasePath', 'generateList', 'PortalJobsList', 'SearchInit',
'PaginateInit']; 'PaginateInit'];