diff --git a/base_comment_template/__manifest__.py b/base_comment_template/__manifest__.py index 3fe483de7..88b705f92 100644 --- a/base_comment_template/__manifest__.py +++ b/base_comment_template/__manifest__.py @@ -5,7 +5,7 @@ "name": "Base Comments Templates", "summary": "Add conditional mako template to any report" "on models that inherits comment.template.", - "version": "16.0.2.2.2", + "version": "17.0.1.0.0", "category": "Reporting", "website": "https://github.com/OCA/reporting-engine", "author": "Camptocamp, Odoo Community Association (OCA)", diff --git a/base_comment_template/models/base_comment_template.py b/base_comment_template/models/base_comment_template.py index 37c0a5f54..aa54cad49 100644 --- a/base_comment_template/models/base_comment_template.py +++ b/base_comment_template/models/base_comment_template.py @@ -80,7 +80,8 @@ class BaseCommentTemplate(models.Model): ], required=True, default="inline_template", - help="This field allows to select the engine to use for rendering the template.", + help="This field allows to select the engine to use for rendering the " + "template.", ) def _get_ir_model_items(self, models): @@ -114,17 +115,19 @@ class BaseCommentTemplate(models.Model): if not res or len(res) != len(models): raise ValidationError(_("Some model (%s) not found") % item.models) - def name_get(self): - """Redefine the name_get method to show the template name with the position.""" - res = [] - for item in self: - name = "{} ({})".format( - item.name, dict(self._fields["position"].selection).get(item.position) + @api.depends("position", "model_ids") + def _compute_display_name(self): + for rec in self: + name = "{name} ({position})".format( + name=rec.name, + position=dict(self._fields["position"].selection).get(rec.position), ) if self.env.context.get("comment_template_model_display"): - name += " (%s)" % ", ".join(item.model_ids.mapped("name")) - res.append((item.id, name)) - return res + name = "{name} ({models})".format( + name=name, + models=", ".join(rec.model_ids.mapped("name")), + ) + rec.display_name = name def _search_model_ids(self, operator, value): # We cannot use model_ids.model in search() method to avoid access errors diff --git a/base_comment_template/models/comment_template.py b/base_comment_template/models/comment_template.py index 0d000f197..8858ac384 100644 --- a/base_comment_template/models/comment_template.py +++ b/base_comment_template/models/comment_template.py @@ -51,9 +51,7 @@ class CommentTemplate(models.AbstractModel): if not domain or record.filtered_domain(domain): record.comment_template_ids = [(4, template.id)] - def render_comment( - self, comment, engine=False, add_context=None, post_process=False - ): + def render_comment(self, comment, engine=False, add_context=None, options=None): self.ensure_one() comment_texts = self.env["mail.render.mixin"]._render_template( template_src=comment.text, @@ -61,6 +59,6 @@ class CommentTemplate(models.AbstractModel): res_ids=[self.id], engine=engine or comment.engine, add_context=add_context, - post_process=post_process, + options=options, ) return markupsafe.Markup(comment_texts[self.id]) or "" diff --git a/base_comment_template/security/ir.model.access.csv b/base_comment_template/security/ir.model.access.csv index af72e1c8f..acfeb4685 100644 --- a/base_comment_template/security/ir.model.access.csv +++ b/base_comment_template/security/ir.model.access.csv @@ -1,4 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_base_comment_template_user,access_base_comment_template_user,model_base_comment_template,,1,0,0,0 access_base_comment_template,access_base_comment_template no one,model_base_comment_template,base.group_no_one,1,1,1,1 access_base_comment_template_preview,access.base.comment.template.preview,model_base_comment_template_preview,base.group_user,1,1,1,0 diff --git a/base_comment_template/tests/test_base_comment_template.py b/base_comment_template/tests/test_base_comment_template.py index 7ad31cdc7..d13a52168 100644 --- a/base_comment_template/tests/test_base_comment_template.py +++ b/base_comment_template/tests/test_base_comment_template.py @@ -47,7 +47,7 @@ class TestCommentTemplate(common.TransactionCase): @classmethod def tearDownClass(cls): teardown_test_model(cls.env, ResUsers) - return super(TestCommentTemplate, cls).tearDownClass() + return super().tearDownClass() def test_template_model_ids(self): self.assertIn( @@ -70,7 +70,7 @@ class TestCommentTemplate(common.TransactionCase): } ) - def test_template_name_get(self): + def test_template_display_name(self): self.assertEqual( self.before_template_id.display_name, "Top template (Top)", diff --git a/base_comment_template/views/base_comment_template_view.xml b/base_comment_template/views/base_comment_template_view.xml index 8fa523737..362947d0a 100644 --- a/base_comment_template/views/base_comment_template_view.xml +++ b/base_comment_template/views/base_comment_template_view.xml @@ -44,7 +44,7 @@ name="web_ribbon" title="Archived" bg_color="bg-danger" - attrs="{'invisible': [('active', '=', True)]}" + invisible="active" />