From 1318473b37864077d51244727483f1425021ec7f Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 28 May 2024 11:15:22 +0530 Subject: [PATCH 1/2] fix: show use_html & response_html in Email Template Modal --- crm/overrides/email_template.py | 2 ++ .../components/Modals/EmailTemplateModal.vue | 23 ++++++++++++++++++- frontend/src/pages/EmailTemplates.vue | 4 ++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/crm/overrides/email_template.py b/crm/overrides/email_template.py index da14c714..3a4e30f7 100644 --- a/crm/overrides/email_template.py +++ b/crm/overrides/email_template.py @@ -41,9 +41,11 @@ class CustomEmailTemplate(EmailTemplate): rows = [ "name", "enabled", + "use_html", "reference_doctype", "subject", "response", + "response_html", "modified", ] return {'columns': columns, 'rows': rows} diff --git a/frontend/src/components/Modals/EmailTemplateModal.vue b/frontend/src/components/Modals/EmailTemplateModal.vue index 2cee3742..21702957 100644 --- a/frontend/src/components/Modals/EmailTemplateModal.vue +++ b/frontend/src/components/Modals/EmailTemplateModal.vue @@ -55,19 +55,40 @@ {{ __('Content') }} * +
+
+ +
diff --git a/frontend/src/pages/EmailTemplates.vue b/frontend/src/pages/EmailTemplates.vue index 4cbb701b..71e41fee 100644 --- a/frontend/src/pages/EmailTemplates.vue +++ b/frontend/src/pages/EmailTemplates.vue @@ -114,8 +114,10 @@ const showEmailTemplateModal = ref(false) const emailTemplate = ref({ subject: '', response: '', + response_html: '', name: '', enabled: 1, + use_html: 0, owner: '', reference_doctype: 'CRM Deal', }) @@ -125,8 +127,10 @@ function showEmailTemplate(name) { emailTemplate.value = { subject: et.subject, response: et.response, + response_html: et.response_html, name: et.name, enabled: et.enabled, + use_html: et.use_html, owner: et.owner, reference_doctype: et.reference_doctype, } From 187bc55d468cd627e576c910927fcc5d30ddf7da Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 28 May 2024 11:15:52 +0530 Subject: [PATCH 2/2] fix: show response_html in email template selector --- .../components/Modals/EmailTemplateSelectorModal.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Modals/EmailTemplateSelectorModal.vue b/frontend/src/components/Modals/EmailTemplateSelectorModal.vue index 2538e7f7..fb414880 100644 --- a/frontend/src/components/Modals/EmailTemplateSelectorModal.vue +++ b/frontend/src/components/Modals/EmailTemplateSelectorModal.vue @@ -31,7 +31,14 @@ {{ __('Subject: {0}', [template.subject]) }} +