From 47ff160b422ac317a5cdca19edfba42c4889656d Mon Sep 17 00:00:00 2001 From: ryv-odoo Date: Fri, 11 Oct 2019 14:39:25 +0000 Subject: [PATCH] [REF] mail: improve and refactor mail template preview PURPOSE Improve mail template preview wizard by improve its views and displaying more rendered fields. It helps users knowing what will be sent to customers. SPECIFICATIONS Rename template model to mail_template_preview to better match the mail template namespace. Remove _inherit on mail.template and instead choose fields to compute and display. Indeed lot of fields are unnecessary or badly computed. Instead just add fields on the wizard that depends on mail template and will be computed based on mail_template_id field of wizard. Improve error management. LINKS Task 2085912 PR #38708 Signed-off-by: Thibault Delavallee (tde) --- addons/mail/__manifest__.py | 2 +- addons/mail/views/mail_template_views.xml | 5 +- addons/mail/wizard/__init__.py | 2 +- addons/mail/wizard/email_template_preview.py | 58 ------------- .../wizard/email_template_preview_view.xml | 51 ----------- addons/mail/wizard/mail_template_preview.py | 86 +++++++++++++++++++ .../wizard/mail_template_preview_views.xml | 61 +++++++++++++ 7 files changed, 151 insertions(+), 114 deletions(-) delete mode 100644 addons/mail/wizard/email_template_preview.py delete mode 100644 addons/mail/wizard/email_template_preview_view.xml create mode 100644 addons/mail/wizard/mail_template_preview.py create mode 100644 addons/mail/wizard/mail_template_preview_views.xml diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py index 632771a25ff..5dc0f4425f1 100644 --- a/addons/mail/__manifest__.py +++ b/addons/mail/__manifest__.py @@ -14,6 +14,7 @@ 'wizard/mail_compose_message_view.xml', 'wizard/mail_resend_cancel_views.xml', 'wizard/mail_resend_message_views.xml', + 'wizard/mail_template_preview_views.xml', 'views/mail_message_subtype_views.xml', 'views/mail_tracking_views.xml', 'views/mail_notification_views.xml', @@ -34,7 +35,6 @@ 'views/mail_alias_views.xml', 'views/res_users_views.xml', 'views/mail_templates.xml', - 'wizard/email_template_preview_view.xml', 'views/mail_template_views.xml', 'views/ir_actions_views.xml', 'views/ir_model_views.xml', diff --git a/addons/mail/views/mail_template_views.xml b/addons/mail/views/mail_template_views.xml index 111a633d092..5e8ddf21d0b 100644 --- a/addons/mail/views/mail_template_views.xml +++ b/addons/mail/views/mail_template_views.xml @@ -29,9 +29,8 @@ Context Action -