From 01982e7eabffb4c5707dd63a8e3359edbb552184 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Mon, 26 Mar 2018 10:07:47 -0400 Subject: [PATCH] utilize transation for instance groups jobs sub panels titles and fix a few linting errors --- .../src/instance-groups/instance-groups.strings.js | 6 +++++- .../jobs/instanceGroupsJobsListContainer.controller.js | 2 +- .../jobs/instanceJobsListContainer.controller.js | 9 +++------ awx/ui/client/src/management-jobs/main.js | 2 +- tower-license | 1 + 5 files changed, 11 insertions(+), 9 deletions(-) create mode 160000 tower-license diff --git a/awx/ui/client/src/instance-groups/instance-groups.strings.js b/awx/ui/client/src/instance-groups/instance-groups.strings.js index 79a21e075e..5ec8f411e6 100644 --- a/awx/ui/client/src/instance-groups/instance-groups.strings.js +++ b/awx/ui/client/src/instance-groups/instance-groups.strings.js @@ -23,8 +23,12 @@ function InstanceGroupsStrings (BaseString) { IS_OFFLINE: t.s('Unavailable to run jobs.'), IS_OFFLINE_LABEL: t.s('Unavailable') }; + + ns.jobs = { + PANEL_TITLE: t.s('Jobs') + }; } InstanceGroupsStrings.$inject = ['BaseStringService']; -export default InstanceGroupsStrings; \ No newline at end of file +export default InstanceGroupsStrings; diff --git a/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js b/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js index 118fc9284b..62fb924efe 100644 --- a/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js +++ b/awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js @@ -6,7 +6,7 @@ function InstanceGroupJobsContainerController (strings, $state) { function init() { const instanceGroupId = $state.params.instance_group_id; - vm.panelTitle = 'Jobs' + vm.panelTitle = strings.get('jobs.PANEL_TITLE'); vm.strings = strings; vm.tab = { diff --git a/awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.controller.js b/awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.controller.js index 650b8e28cf..306249f842 100644 --- a/awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.controller.js +++ b/awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.controller.js @@ -1,20 +1,17 @@ -function InstanceGroupJobsContainerController (strings, $state) { +function InstanceGroupJobsContainerController (strings) { const vm = this || {}; init(); function init() { - const instanceGroupId = $state.params.instance_group_id; - - vm.panelTitle = 'Jobs' + vm.panelTitle = strings.get('jobs.PANEL_TITLE'); vm.strings = strings; } } InstanceGroupJobsContainerController.$inject = [ - 'InstanceGroupsStrings', - '$state' + 'InstanceGroupsStrings' ]; export default InstanceGroupJobsContainerController; diff --git a/awx/ui/client/src/management-jobs/main.js b/awx/ui/client/src/management-jobs/main.js index 7b850261b9..ef291e1ee5 100644 --- a/awx/ui/client/src/management-jobs/main.js +++ b/awx/ui/client/src/management-jobs/main.js @@ -13,4 +13,4 @@ export default managementJobsCard.name, managementJobsScheduler.name, managementJobsNotifications.name - ]) + ]); diff --git a/tower-license b/tower-license new file mode 160000 index 0000000000..009cc73a80 --- /dev/null +++ b/tower-license @@ -0,0 +1 @@ +Subproject commit 009cc73a80e5123143e9c780c7011903d4c2a331