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

Removed inventory sorting from jobs list. Changed Last Run to Last Used in project sort filters.

Browse Source
This commit is contained in:
mabashian
2019-05-01 09:17:15 -04:00
parent b7e26b3507
commit eaaad89a8c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,8 +68,6 @@ function ListJobsController (
{ label: `${strings.get('sort.START_TIME_DESCENDING')}`, 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_ASCENDING')}`, value: 'created_by__id' },
{ label: `${strings.get('sort.LAUNCHED_BY_DESCENDING')}`, 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_ASCENDING')}`, value: 'unified_job_template__project__id' },
{ label: `${strings.get('sort.PROJECT_DESCENDING')}`, value: '-unified_job_template__project__id' }, { label: `${strings.get('sort.PROJECT_DESCENDING')}`, value: '-unified_job_template__project__id' },
toolbarSortDefault toolbarSortDefault

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

@@ -71,8 +71,8 @@ function projectsListController (
{ label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' }, { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' },
{ label: `${strings.get('sort.MODIFIED_ASCENDING')}`, value: 'modified' }, { 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.LAST_JOB_RUN_ASCENDING')}`, value: 'last_job_run' }, { label: `${strings.get('sort.LAST_USED_ASCENDING')}`, value: 'last_job_run' },
{ label: `${strings.get('sort.LAST_JOB_RUN_DESCENDING')}`, value: '-last_job_run' }, { label: `${strings.get('sort.LAST_USED_DESCENDING')}`, value: '-last_job_run' },
{ label: `${strings.get('sort.ORGANIZATION_ASCENDING')}`, value: 'organization' }, { label: `${strings.get('sort.ORGANIZATION_ASCENDING')}`, value: 'organization' },
{ label: `${strings.get('sort.ORGANIZATION_DESCENDING')}`, value: '-organization' } { label: `${strings.get('sort.ORGANIZATION_DESCENDING')}`, value: '-organization' }
]; ];

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

@@ -114,6 +114,8 @@ function BaseStringService (namespace) {
EXPIRES_DESCENDING: t.s('Expires (Descending)'), EXPIRES_DESCENDING: t.s('Expires (Descending)'),
LAST_JOB_RUN_ASCENDING: t.s('Last Run (Ascending)'), LAST_JOB_RUN_ASCENDING: t.s('Last Run (Ascending)'),
LAST_JOB_RUN_DESCENDING: t.s('Last Run (Descending)'), LAST_JOB_RUN_DESCENDING: t.s('Last Run (Descending)'),
LAST_USED_ASCENDING: t.s('Last Used (Ascending)'),
LAST_USED_DESCENDING: t.s('Last Used (Descending)'),
USERNAME_ASCENDING: t.s('Username (Ascending)'), USERNAME_ASCENDING: t.s('Username (Ascending)'),
USERNAME_DESCENDING: t.s('Username (Descending)'), USERNAME_DESCENDING: t.s('Username (Descending)'),
START_TIME_ASCENDING: t.s('Start Time (Ascending)'), START_TIME_ASCENDING: t.s('Start Time (Ascending)'),