Skip to content
Snippets Groups Projects
Commit 09936973 authored by oury.balde's avatar oury.balde
Browse files

Update composer value based on template counterpart for Redner integration

Enhance _set_value_from_template to support Redner integration
parent 074376c8
No related branches found
No related tags found
1 merge request!81Update composer value based on template counterpart for Redner integration
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
Changelog Changelog
========= =========
18.0.1.2.2
----------
Improve _set_value_from_template for redner integration.
18.0.1.2.1 18.0.1.2.1
---------- ----------
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
{ {
"name": "Redner", "name": "Redner",
"license": "AGPL-3", "license": "AGPL-3",
"version": "18.0.1.2.1", "version": "18.0.1.2.2",
"category": "Reporting", "category": "Reporting",
"author": "XCG Consulting", "author": "XCG Consulting",
"website": "https://orbeet.io/", "website": "https://orbeet.io/",
......
...@@ -6,11 +6,13 @@ ...@@ -6,11 +6,13 @@
is_redner_template = fields.Boolean(related="template_id.is_redner_template") is_redner_template = fields.Boolean(related="template_id.is_redner_template")
def get_mail_values(self, res_ids): def _set_value_from_template(self, template_fname, composer_fname=False):
""" """Override: Set composer value from its template counterpart, considering
Overrides the get_mail_values method to enhance email value retrieval redner integration."""
based on mass mail mode and redner template. self.ensure_one()
""" composer_fname = composer_fname or template_fname
all_mail_values = super().get_mail_values(res_ids)
mass_mail_mode = self.composition_mode == "mass_mail" res = super()._set_value_from_template(
template_fname, composer_fname=composer_fname
)
...@@ -16,7 +18,6 @@ ...@@ -16,7 +18,6 @@
# Check if in mass mail mode and if redner template exists if self.is_redner_template and template_fname == "body_html":
if mass_mail_mode and self.model and self.template_id.is_redner_template: if self.composition_mode == "comment" and not self.composition_batch:
template_values = self.generate_email_for_composer( res_ids = self._evaluate_res_ids()
self.template_id.id, res_ids, ["body_html"] rendering_res_ids = res_ids or [0] # Fallback to dummy ID
)
...@@ -22,6 +23,5 @@ ...@@ -22,6 +23,5 @@
# Update email values with rendered content template_rendered = self.template_id._patch_email_values(
for res_id in res_ids: {composer_fname: {}}, rendering_res_ids[0]
body = template_values[res_id]["body"] )[composer_fname]
all_mail_values[res_id].update({"body": body, "body_html": body})
...@@ -27,2 +27,5 @@ ...@@ -27,2 +27,5 @@
return all_mail_values self[composer_fname] = template_rendered
return self[composer_fname]
return res
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment