External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-28 22:35:08 -02:30
Code Issues Packages Projects Releases Wiki Activity

In UI, rename start to started

Browse Source
This commit is contained in:
Jim Ladd
2019-07-17 12:54:42 -07:00
parent 0398ce0530
commit 03ebe44802
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/notifications/notificationTemplates.form.js
View File

@@ -588,7 +588,7 @@ export default ['i18n', function(i18n) {
class: 'Form-formGroup--fullWidth', class: 'Form-formGroup--fullWidth',
default: false, default: false,
}, },
start_message: { started_message: {
label: i18n._('Start Message'), label: i18n._('Start Message'),
class: 'Form-formGroup--fullWidth', class: 'Form-formGroup--fullWidth',
type: 'syntax_highlight', type: 'syntax_highlight',
@@ -597,7 +597,7 @@ export default ['i18n', function(i18n) {
ngShow: "customize_messages", ngShow: "customize_messages",
rows: 2, rows: 2,
}, },
start_body: { started_body: {
label: i18n._('Start Expanded Message'), label: i18n._('Start Expanded Message'),
class: 'Form-formGroup--fullWidth', class: 'Form-formGroup--fullWidth',
type: 'syntax_highlight', type: 'syntax_highlight',

22
awx/ui/client/src/notifications/shared/message-utils.service.js
View File

@@ -5,11 +5,11 @@ export default [function () {
return null; return null;
} }
return { return {
start: { started: {
message: $scope.start_message === defaultMessages.start.message message: $scope.started_message === defaultMessages.started.message
? null : $scope.start_message, ? null : $scope.started_message,
body: $scope.start_body === defaultMessages.start.body body: $scope.started_body === defaultMessages.started.body
? null : $scope.start_body, ? null : $scope.started_body,
}, },
success: { success: {
message: $scope.success_message === defaultMessages.success.message message: $scope.success_message === defaultMessages.success.message
@@ -26,8 +26,8 @@ export default [function () {
}; };
}, },
setMessagesOnScope: function ($scope, messages, defaultMessages) { setMessagesOnScope: function ($scope, messages, defaultMessages) {
$scope.start_message = defaultMessages.start.message; $scope.started_message = defaultMessages.started.message;
$scope.start_body = defaultMessages.start.body; $scope.started_body = defaultMessages.started.body;
$scope.success_message = defaultMessages.success.message; $scope.success_message = defaultMessages.success.message;
$scope.success_body = defaultMessages.success.body; $scope.success_body = defaultMessages.success.body;
$scope.error_message = defaultMessages.error.message; $scope.error_message = defaultMessages.error.message;
@@ -36,13 +36,13 @@ export default [function () {
return; return;
} }
let customized = false; let customized = false;
if (messages.start.message) { if (messages.started.message) {
customized = true; customized = true;
$scope.start_message = messages.start.message; $scope.started_message = messages.started.message;
} }
if (messages.start.body) { if (messages.started.body) {
customized = true; customized = true;
$scope.start_body = messages.start.body; $scope.started_body = messages.started.body;
} }
if (messages.success.message) { if (messages.success.message) {
customized = true; customized = true;