External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

handle null messages.workflow_approval some more

Browse Source
This commit is contained in:
Keith Grant 2020-09-14 16:05:03 -07:00
parent b27d9b680a
commit 236ae6c5b6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui_next/src/screens/NotificationTemplate/shared/NotificationTemplateForm.jsx
View File

@ -118,8 +118,8 @@ function NotificationTemplateForm({
const defs = defaultMessages[template.notification_type || 'email'];
const mergeDefaultMessages = (templ = {}, def) => {
return {
message: templ.message || def.message || '',
body: templ.body || def.body || '',
message: templ?.message || def.message || '',
body: templ?.body || def.body || '',
};
};
@ -145,25 +145,25 @@ function NotificationTemplateForm({
workflow_approval: {
approved: {
...mergeDefaultMessages(
messages.workflow_approval.approved,
messages.workflow_approval?.approved,
defs.workflow_approval.approved
),
},
denied: {
...mergeDefaultMessages(
messages.workflow_approval.denied,
messages.workflow_approval?.denied,
defs.workflow_approval.denied
),
},
running: {
...mergeDefaultMessages(
messages.workflow_approval.running,
messages.workflow_approval?.running,
defs.workflow_approval.running
),
},
timed_out: {
...mergeDefaultMessages(
messages.workflow_approval.timed_out,
messages.workflow_approval?.timed_out,
defs.workflow_approval.timed_out
),
},

8
awx/ui_next/src/screens/NotificationTemplate/shared/hasCustomMessages.js
View File

@ -8,19 +8,19 @@ export default function hasCustomMessages(messages, defaults) {
isCustomized(messages.success, defaults.success) ||
isCustomized(messages.error, defaults.error) ||
isCustomized(
messages.workflow_approval.approved,
messages.workflow_approval?.approved,
defaults.workflow_approval.approved
) ||
isCustomized(
messages.workflow_approval.denied,
messages.workflow_approval?.denied,
defaults.workflow_approval.denied
) ||
isCustomized(
messages.workflow_approval.running,
messages.workflow_approval?.running,
defaults.workflow_approval.running
) ||
isCustomized(
messages.workflow_approval.timed_out,
messages.workflow_approval?.timed_out,
defaults.workflow_approval.timed_out
)
);