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

Adds more sort options to lists

Browse Source
This commit is contained in:
mabashian 2019-04-26 11:52:07 -04:00
parent 7f452ee8d1
commit 3cd8d4f7e6
6 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/features/jobs/jobsList.controller.js
View File

@ -66,6 +66,12 @@ function ListJobsController (
{ label: `${strings.get('sort.FINISH_TIME_ASCENDING')}`, value: 'finished' },
{ label: `${strings.get('sort.START_TIME_ASCENDING')}`, value: 'started' },
{ label: `${strings.get('sort.START_TIME_DESCENDING')}`, value: '-started' },
{ label: `${strings.get('sort.LAUNCHED_BY_ASCENDING')}`, value: 'created_by__id' },
{ label: `${strings.get('sort.LAUNCHED_BY_DESCENDING')}`, value: '-created_by__id' },
{ label: `${strings.get('sort.INVENTORY_ASCENDING')}`, value: 'unified_job_template__inventory__id' },
{ label: `${strings.get('sort.INVENTORY_DESCENDING')}`, value: '-unified_job_template__inventory__id' },
{ label: `${strings.get('sort.PROJECT_ASCENDING')}`, value: 'unified_job_template__project__id' },
{ label: `${strings.get('sort.PROJECT_DESCENDING')}`, value: '-unified_job_template__project__id' },
toolbarSortDefault
];

4
awx/ui/client/features/projects/projectsList.controller.js
View File

@ -72,7 +72,9 @@ function projectsListController (
{ label: `${strings.get('sort.MODIFIED_ASCENDING')}`, value: 'modified' },
{ label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' },
{ label: `${strings.get('sort.LAST_JOB_RUN_ASCENDING')}`, value: 'last_job_run' },
{ label: `${strings.get('sort.LAST_JOB_RUN_DESCENDING')}`, value: '-last_job_run' }
{ label: `${strings.get('sort.LAST_JOB_RUN_DESCENDING')}`, value: '-last_job_run' },
{ label: `${strings.get('sort.ORGANIZATION_ASCENDING')}`, value: 'organization' },
{ label: `${strings.get('sort.ORGANIZATION_DESCENDING')}`, value: '-organization' }
];
vm.toolbarSortValue = toolbarSortDefault;

6
awx/ui/client/features/templates/templatesList.controller.js
View File

@ -75,7 +75,11 @@ function ListTemplatesController(
{ label: `${strings.get('sort.MODIFIED_ASCENDING')}`, value: 'modified' },
{ label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' },
{ label: `${strings.get('sort.LAST_JOB_RUN_ASCENDING')}`, value: 'last_job_run' },
{ label: `${strings.get('sort.LAST_JOB_RUN_DESCENDING')}`, value: '-last_job_run' }
{ label: `${strings.get('sort.LAST_JOB_RUN_DESCENDING')}`, value: '-last_job_run' },
{ label: `${strings.get('sort.INVENTORY_ASCENDING')}`, value: 'job_template__inventory__id' },
{ label: `${strings.get('sort.INVENTORY_DESCENDING')}`, value: '-job_template__inventory__id' },
{ label: `${strings.get('sort.PROJECT_ASCENDING')}`, value: 'project__id' },
{ label: `${strings.get('sort.PROJECT_DESCENDING')}`, value: '-project__id' },
];
vm.toolbarSortValue = toolbarSortDefault;

13
awx/ui/client/lib/services/base-string.service.js
View File

@ -121,7 +121,18 @@ function BaseStringService (namespace) {
FINISH_TIME_ASCENDING: t.s('Finish Time (Ascending)'),
FINISH_TIME_DESCENDING: t.s('Finish Time (Descending)'),
UUID_ASCENDING: t.s('UUID (Ascending)'),
UUID_DESCENDING: t.s('UUID (Descending)')
UUID_DESCENDING: t.s('UUID (Descending)'),
LAUNCHED_BY_ASCENDING: t.s('Launched By (Ascending)'),
LAUNCHED_BY_DESCENDING: t.s('Launched By (Descending)'),
INVENTORY_ASCENDING: t.s('Inventory (Ascending)'),
INVENTORY_DESCENDING: t.s('Inventory (Descending)'),
PROJECT_ASCENDING: t.s('Project (Ascending)'),
PROJECT_DESCENDING: t.s('Project (Descending)'),
ORGANIZATION_ASCENDING: t.s('Organization (Ascending)'),
ORGANIZATION_DESCENDING: t.s('Organization (Descending)'),
CAPACITY_ASCENDING: t.s('Capacity (Ascending)'),
CAPACITY_DESCENDING: t.s('Capacity (Descending)')
};
this.ALERT = ({ header, body }) => t.s('{{ header }} {{ body }}', { header, body });

4
awx/ui/client/src/instance-groups/instances/instance-modal.controller.js
View File

@ -48,7 +48,9 @@ function InstanceModalController ($scope, $state, Dataset, models, strings, Proc
{ label: `${strings.get('sort.CREATED_ASCENDING')}`, value: 'created' },
{ label: `${strings.get('sort.CREATED_DESCENDING')}`, value: '-created' },
{ label: `${strings.get('sort.MODIFIED_ASCENDING')}`, value: 'modified' },
{ label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' }
{ label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' },
{ label: `${strings.get('sort.CAPACITY_ASCENDING')}`, value: 'capacity' },
{ label: `${strings.get('sort.CAPACITY_DESCENDING')}`, value: '-capacity' }
];
const removeStateParamsListener = $scope.$watchCollection('$state.params', () => {

4
awx/ui/client/src/instance-groups/instances/instances.controller.js
View File

@ -30,7 +30,9 @@ function InstancesController ($scope, $state, $http, $transitions, models, strin
{ label: `${strings.get('sort.CREATED_ASCENDING')}`, value: 'created' },
{ label: `${strings.get('sort.CREATED_DESCENDING')}`, value: '-created' },
{ label: `${strings.get('sort.MODIFIED_ASCENDING')}`, value: 'modified' },
{ label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' }
{ label: `${strings.get('sort.MODIFIED_DESCENDING')}`, value: '-modified' },
{ label: `${strings.get('sort.CAPACITY_ASCENDING')}`, value: 'capacity' },
{ label: `${strings.get('sort.CAPACITY_DESCENDING')}`, value: '-capacity' }
];
const removeStateParamsListener = $scope.$watchCollection('$state.params', () => {