From 03ebe448023ed9a6142ba0d41746d6b2e0ab90cc Mon Sep 17 00:00:00 2001 From: Jim Ladd Date: Wed, 17 Jul 2019 12:54:42 -0700 Subject: [PATCH] In UI, rename start to started --- .../notificationTemplates.form.js | 4 ++-- .../shared/message-utils.service.js | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/awx/ui/client/src/notifications/notificationTemplates.form.js b/awx/ui/client/src/notifications/notificationTemplates.form.js index 8defd5c405..bb586424a0 100644 --- a/awx/ui/client/src/notifications/notificationTemplates.form.js +++ b/awx/ui/client/src/notifications/notificationTemplates.form.js @@ -588,7 +588,7 @@ export default ['i18n', function(i18n) { class: 'Form-formGroup--fullWidth', default: false, }, - start_message: { + started_message: { label: i18n._('Start Message'), class: 'Form-formGroup--fullWidth', type: 'syntax_highlight', @@ -597,7 +597,7 @@ export default ['i18n', function(i18n) { ngShow: "customize_messages", rows: 2, }, - start_body: { + started_body: { label: i18n._('Start Expanded Message'), class: 'Form-formGroup--fullWidth', type: 'syntax_highlight', diff --git a/awx/ui/client/src/notifications/shared/message-utils.service.js b/awx/ui/client/src/notifications/shared/message-utils.service.js index 16a7f7e5d4..bd46a5b2c9 100644 --- a/awx/ui/client/src/notifications/shared/message-utils.service.js +++ b/awx/ui/client/src/notifications/shared/message-utils.service.js @@ -5,11 +5,11 @@ export default [function () { return null; } return { - start: { - message: $scope.start_message === defaultMessages.start.message - ? null : $scope.start_message, - body: $scope.start_body === defaultMessages.start.body - ? null : $scope.start_body, + started: { + message: $scope.started_message === defaultMessages.started.message + ? null : $scope.started_message, + body: $scope.started_body === defaultMessages.started.body + ? null : $scope.started_body, }, success: { message: $scope.success_message === defaultMessages.success.message @@ -26,8 +26,8 @@ export default [function () { }; }, setMessagesOnScope: function ($scope, messages, defaultMessages) { - $scope.start_message = defaultMessages.start.message; - $scope.start_body = defaultMessages.start.body; + $scope.started_message = defaultMessages.started.message; + $scope.started_body = defaultMessages.started.body; $scope.success_message = defaultMessages.success.message; $scope.success_body = defaultMessages.success.body; $scope.error_message = defaultMessages.error.message; @@ -36,13 +36,13 @@ export default [function () { return; } let customized = false; - if (messages.start.message) { + if (messages.started.message) { customized = true; - $scope.start_message = messages.start.message; + $scope.started_message = messages.started.message; } - if (messages.start.body) { + if (messages.started.body) { customized = true; - $scope.start_body = messages.start.body; + $scope.started_body = messages.started.body; } if (messages.success.message) { customized = true;