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

Fix notification template details

Browse Source 
Fix notification template details

See: https://github.com/ansible/awx/issues/11982
This commit is contained in:
nixocio
2022-03-31 11:10:07 -04:00
parent 4b913a0ae8
commit a920c9cc20
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/src/screens/NotificationTemplate/NotificationTemplateDetail/NotificationTemplateDetail.js
View File

@@ -447,7 +447,7 @@ function CustomMessageDetails({ messages, defaults, type }) {
{showMessages && ( {showMessages && (
<CodeDetail <CodeDetail
label={t`Start message`} label={t`Start message`}
value={messages.started.message || defaults.started.message} value={messages.started?.message || defaults.started?.message}
mode="jinja2" mode="jinja2"
rows="2" rows="2"
fullWidth fullWidth
@@ -456,7 +456,7 @@ function CustomMessageDetails({ messages, defaults, type }) {
{showBodies && ( {showBodies && (
<CodeDetail <CodeDetail
label={t`Start message body`} label={t`Start message body`}
value={messages.started.body || defaults.started.body} value={messages.started?.body || defaults.started?.body}
mode="jinja2" mode="jinja2"
rows="6" rows="6"
fullWidth fullWidth
@@ -465,7 +465,7 @@ function CustomMessageDetails({ messages, defaults, type }) {
{showMessages && ( {showMessages && (
<CodeDetail <CodeDetail
label={t`Success message`} label={t`Success message`}
value={messages.success.message || defaults.success.message} value={messages.success?.message || defaults.success?.message}
mode="jinja2" mode="jinja2"
rows="2" rows="2"
fullWidth fullWidth
@@ -474,7 +474,7 @@ function CustomMessageDetails({ messages, defaults, type }) {
{showBodies && ( {showBodies && (
<CodeDetail <CodeDetail
label={t`Success message body`} label={t`Success message body`}
value={messages.success.body || defaults.success.body} value={messages.success?.body || defaults.success?.body}
mode="jinja2" mode="jinja2"
rows="6" rows="6"
fullWidth fullWidth
@@ -483,7 +483,7 @@ function CustomMessageDetails({ messages, defaults, type }) {
{showMessages && ( {showMessages && (
<CodeDetail <CodeDetail
label={t`Error message`} label={t`Error message`}
value={messages.error.message || defaults.error.message} value={messages.error?.message || defaults.error?.message}
mode="jinja2" mode="jinja2"
rows="2" rows="2"
fullWidth fullWidth
@@ -492,7 +492,7 @@ function CustomMessageDetails({ messages, defaults, type }) {
{showBodies && ( {showBodies && (
<CodeDetail <CodeDetail
label={t`Error message body`} label={t`Error message body`}
value={messages.error.body || defaults.error.body} value={messages.error?.body || defaults.error?.body}
mode="jinja2" mode="jinja2"
rows="6" rows="6"
fullWidth fullWidth

4
awx/ui/src/screens/NotificationTemplate/shared/hasCustomMessages.js
View File

@@ -30,10 +30,10 @@ function isCustomized(message, defaultMessage) {
if (!message) { if (!message) {
return false; return false;
} }
if (message.message && message.message !== defaultMessage.message) { if (message?.message !== defaultMessage?.message) {
return true; return true;
} }
if (message.body && message.body !== defaultMessage.body) { if (message?.body !== defaultMessage?.body) {
return true; return true;
} }
return false; return false;