External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 15:58:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

add custom notification message input fields

Browse Source
This commit is contained in:
Keith Grant
2019-06-03 09:56:27 -07:00
committed by Jim Ladd
parent 2eaf62a62d
commit adf25c61a2
4 changed files with 66 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/notifications/add/add.controller.js
View File

@@ -186,6 +186,14 @@ export default ['Rest', 'Wait', 'NotificationsFormObject',
"name": $scope.name,
"description": $scope.description,
"organization": $scope.organization,
"messages": $scope.customize_messages ? {
start_message: $scope.start_message,
start_body: $scope.start_body,
success_message: $scope.success_message,
success_body: $scope.success_body,
error_message: $scope.error_message,
error_body: $scope.error_body,
} : null,
"notification_type": v,
"notification_configuration": {}
};

8
awx/ui/client/src/notifications/edit/edit.controller.js
View File

@@ -269,6 +269,14 @@ export default ['Rest', 'Wait',
"name": $scope.name,
"description": $scope.description,
"organization": $scope.organization,
"messages": $scope.customize_messages ? {
start_message: $scope.start_message,
start_body: $scope.start_body,
success_message: $scope.success_message,
success_body: $scope.success_body,
error_message: $scope.error_message,
error_body: $scope.error_body,
} : null,
"notification_type": v,
"notification_configuration": {}
};

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

@@ -581,7 +581,55 @@ export default ['i18n', function(i18n) {
ngShow: "notification_type.value == 'slack' ",
ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)',
awPopOver: i18n._('Specify a notification color. Acceptable colors are hex color code (example: #3af or #789abc) .')
}
},
customize_messages: {
label: i18n._('Customize messages…'),
type: 'checkbox',
class: 'Form-formGroup--fullWidth',
default: false,
},
start_message: {
label: i18n._('Start Message'),
class: 'Form-formGroup--fullWidth',
type: 'text',
default: '',
ngShow: "customize_messages",
},
start_body: {
label: i18n._('Start Body'),
class: 'Form-formGroup--fullWidth',
type: 'textarea',
default: '',
ngShow: "customize_messages && notification_type.value == 'email'",
},
success_message: {
label: i18n._('Success Message'),
class: 'Form-formGroup--fullWidth',
type: 'text',
default: '',
ngShow: "customize_messages",
},
success_body: {
label: i18n._('Success Body'),
class: 'Form-formGroup--fullWidth',
type: 'textarea',
default: '',
ngShow: "customize_messages && notification_type.value == 'email'",
},
error_message: {
label: i18n._('Error Message'),
class: 'Form-formGroup--fullWidth',
type: 'text',
default: '',
ngShow: "customize_messages",
},
error_body: {
label: i18n._('Error Body'),
class: 'Form-formGroup--fullWidth',
type: 'textarea',
default: '',
ngShow: "customize_messages && notification_type.value == 'email'",
},
},
buttons: { //for now always generates <button> tags

2
awx/ui/client/src/shared/form-generator.js
View File

@@ -697,7 +697,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += `<div id='${form.name}_${fld}_group' class='form-group Form-formGroup `;
html += (field.disabled) ? `Form-formGroup--disabled ` : ``;
html += (field.type === "checkbox") ? "Form-formGroup--checkbox" : "";
html += (field.type === "checkbox") ? "Form-formGroup--checkbox " : "";
html += (field['class']) ? (field['class']) : "";
html += "'";
html += (field.ngShow) ? this.attr(field, 'ngShow') : "";