From 2a5d4425d09e0cd8b6802cf271aa398d66662348 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Fri, 26 Jan 2024 18:46:09 +0530 Subject: [PATCH] fix: added email template modal which is showed when row in listview is clicked --- crm/overrides/email_template.py | 1 + .../ListViews/EmailTemplatesListView.vue | 8 +- .../components/Modals/EmailTemplateModal.vue | 190 ++++++++++++++++++ frontend/src/pages/EmailTemplates.vue | 67 +++--- 4 files changed, 220 insertions(+), 46 deletions(-) create mode 100644 frontend/src/components/Modals/EmailTemplateModal.vue diff --git a/crm/overrides/email_template.py b/crm/overrides/email_template.py index af7ed764..da14c714 100644 --- a/crm/overrides/email_template.py +++ b/crm/overrides/email_template.py @@ -43,6 +43,7 @@ class CustomEmailTemplate(EmailTemplate): "enabled", "reference_doctype", "subject", + "response", "modified", ] return {'columns': columns, 'rows': rows} diff --git a/frontend/src/components/ListViews/EmailTemplatesListView.vue b/frontend/src/components/ListViews/EmailTemplatesListView.vue index dcc82cc9..4f0f09b3 100644 --- a/frontend/src/components/ListViews/EmailTemplatesListView.vue +++ b/frontend/src/components/ListViews/EmailTemplatesListView.vue @@ -3,10 +3,7 @@ :columns="columns" :rows="rows" :options="{ - getRowRoute: (row) => ({ - name: 'Email Template', - params: { emailTemplateId: row.name }, - }), + onRowClick: (row) => emit('showEmailTemplate', row.name), selectable: options.selectable, }" row-key="name" @@ -72,6 +69,7 @@ import { ListRowItem, ListFooter, } from 'frappe-ui' +import { defineModel } from 'vue' const props = defineProps({ rows: { @@ -92,7 +90,7 @@ const props = defineProps({ }, }) -const emit = defineEmits(['loadMore']) +const emit = defineEmits(['loadMore', 'showEmailTemplate']) const pageLengthCount = defineModel() diff --git a/frontend/src/components/Modals/EmailTemplateModal.vue b/frontend/src/components/Modals/EmailTemplateModal.vue new file mode 100644 index 00000000..626520d9 --- /dev/null +++ b/frontend/src/components/Modals/EmailTemplateModal.vue @@ -0,0 +1,190 @@ + + + diff --git a/frontend/src/pages/EmailTemplates.vue b/frontend/src/pages/EmailTemplates.vue index 8245f643..7b80cdfb 100644 --- a/frontend/src/pages/EmailTemplates.vue +++ b/frontend/src/pages/EmailTemplates.vue @@ -19,6 +19,7 @@ totalCount: emailTemplates.data.total_count, }" @loadMore="() => loadMore++" + @showEmailTemplate="showEmailTemplate" />
- - No Logs Found + + No Email Templates Found
+