From eaaad89a8c69f680b81062cb794f8e37f3d434e8 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 1 May 2019 09:17:15 -0400 Subject: [PATCH] Removed inventory sorting from jobs list. Changed Last Run to Last Used in project sort filters. --- awx/ui/client/features/jobs/jobsList.controller.js | 2 -- awx/ui/client/features/projects/projectsList.controller.js | 4 ++-- awx/ui/client/lib/services/base-string.service.js | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js index c4784e5a69..3881a4071c 100644 --- a/awx/ui/client/features/jobs/jobsList.controller.js +++ b/awx/ui/client/features/jobs/jobsList.controller.js @@ -68,8 +68,6 @@ function ListJobsController ( { 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 diff --git a/awx/ui/client/features/projects/projectsList.controller.js b/awx/ui/client/features/projects/projectsList.controller.js index d1ba3922f7..a295d6e52b 100644 --- a/awx/ui/client/features/projects/projectsList.controller.js +++ b/awx/ui/client/features/projects/projectsList.controller.js @@ -71,8 +71,8 @@ function projectsListController ( { label: `${strings.get('sort.NAME_DESCENDING')}`, value: '-name' }, { 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_USED_ASCENDING')}`, 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_DESCENDING')}`, value: '-organization' } ]; diff --git a/awx/ui/client/lib/services/base-string.service.js b/awx/ui/client/lib/services/base-string.service.js index faf89389e7..3e7b3b7cd7 100644 --- a/awx/ui/client/lib/services/base-string.service.js +++ b/awx/ui/client/lib/services/base-string.service.js @@ -114,6 +114,8 @@ function BaseStringService (namespace) { EXPIRES_DESCENDING: t.s('Expires (Descending)'), LAST_JOB_RUN_ASCENDING: t.s('Last Run (Ascending)'), 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_DESCENDING: t.s('Username (Descending)'), START_TIME_ASCENDING: t.s('Start Time (Ascending)'),