mirror of https://github.com/OCA/social.git
[IMP] mail_template_substitute: black, isort, prettier
Karthik, Sodexis
parent
49fce5f0d1
commit
10b60f22f8
|
|
@ -8,8 +8,7 @@
|
|||
""",
|
||||
"version": "12.0.1.0.1",
|
||||
"license": "AGPL-3",
|
||||
"author": "ACSONE SA/NV,"
|
||||
"Odoo Community Association (OCA)",
|
||||
"author": "ACSONE SA/NV," "Odoo Community Association (OCA)",
|
||||
"website": "https://github.com/OCA/social",
|
||||
"depends": ["base", "mail", "report_substitute"],
|
||||
"data": [
|
||||
|
|
|
|||
|
|
@ -22,9 +22,7 @@ class MailTemplate(models.Model):
|
|||
if isinstance(active_ids, pycompat.integer_types):
|
||||
active_ids = [active_ids]
|
||||
model = self.env[model_id.model]
|
||||
for (
|
||||
substitution_template_rule
|
||||
) in self.mail_template_substitution_rule_ids:
|
||||
for substitution_template_rule in self.mail_template_substitution_rule_ids:
|
||||
domain = safe_eval(substitution_template_rule.domain)
|
||||
domain.append(("id", "in", active_ids))
|
||||
if set(model.search(domain).ids) == set(active_ids):
|
||||
|
|
@ -33,9 +31,7 @@ class MailTemplate(models.Model):
|
|||
|
||||
@api.multi
|
||||
def get_email_template(self, res_ids):
|
||||
substitution_template = self._get_substitution_template(
|
||||
self.model_id, res_ids
|
||||
)
|
||||
substitution_template = self._get_substitution_template(self.model_id, res_ids)
|
||||
if substitution_template:
|
||||
return substitution_template.get_email_template(res_ids)
|
||||
return super().get_email_template(res_ids)
|
||||
|
|
|
|||
|
|
@ -1,16 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!-- Copyright 2019 ACSONE SA/NV
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record model="ir.model.access" id="mail_template_substitution_rule_access">
|
||||
<field name="name">mail.template.substitution.rule access</field>
|
||||
<field name="model_id" ref="model_mail_template_substitution_rule"/>
|
||||
<field name="group_id" ref="base.group_user"/>
|
||||
<field name="perm_read" eval="1"/>
|
||||
<field name="perm_create" eval="1"/>
|
||||
<field name="perm_write" eval="1"/>
|
||||
<field name="perm_unlink" eval="1"/>
|
||||
<field name="model_id" ref="model_mail_template_substitution_rule" />
|
||||
<field name="group_id" ref="base.group_user" />
|
||||
<field name="perm_read" eval="1" />
|
||||
<field name="perm_create" eval="1" />
|
||||
<field name="perm_write" eval="1" />
|
||||
<field name="perm_unlink" eval="1" />
|
||||
</record>
|
||||
</odoo>
|
||||
|
|
|
|||
|
|
@ -7,53 +7,51 @@ from odoo.tests.common import TransactionCase
|
|||
class TestMailTemplateSubstitute(TransactionCase):
|
||||
def setUp(self):
|
||||
super(TestMailTemplateSubstitute, self).setUp()
|
||||
self.smt2 = self.env['mail.template'].create(
|
||||
self.smt2 = self.env["mail.template"].create(
|
||||
{
|
||||
'name': 'substitute_template_2',
|
||||
'model_id': self.env.ref('base.model_res_partner').id,
|
||||
"name": "substitute_template_2",
|
||||
"model_id": self.env.ref("base.model_res_partner").id,
|
||||
}
|
||||
)
|
||||
self.smt1 = self.env['mail.template'].create(
|
||||
self.smt1 = self.env["mail.template"].create(
|
||||
{
|
||||
'name': 'substitute_template_1',
|
||||
'model_id': self.env.ref('base.model_res_partner').id,
|
||||
'mail_template_substitution_rule_ids': [
|
||||
"name": "substitute_template_1",
|
||||
"model_id": self.env.ref("base.model_res_partner").id,
|
||||
"mail_template_substitution_rule_ids": [
|
||||
(
|
||||
0,
|
||||
0,
|
||||
{
|
||||
'substitution_mail_template_id': self.smt2.id,
|
||||
'domain': "[('id', '=', False)]",
|
||||
"substitution_mail_template_id": self.smt2.id,
|
||||
"domain": "[('id', '=', False)]",
|
||||
},
|
||||
)
|
||||
],
|
||||
}
|
||||
)
|
||||
self.mt = self.env['mail.template'].create(
|
||||
self.mt = self.env["mail.template"].create(
|
||||
{
|
||||
'name': 'base_template',
|
||||
'model_id': self.env.ref('base.model_res_partner').id,
|
||||
'mail_template_substitution_rule_ids': [
|
||||
(0, 0, {'substitution_mail_template_id': self.smt1.id})
|
||||
"name": "base_template",
|
||||
"model_id": self.env.ref("base.model_res_partner").id,
|
||||
"mail_template_substitution_rule_ids": [
|
||||
(0, 0, {"substitution_mail_template_id": self.smt1.id})
|
||||
],
|
||||
}
|
||||
)
|
||||
self.mail_compose = self.env['mail.compose.message'].create(
|
||||
{'template_id': self.mt.id, 'composition_mode': 'mass_mail'}
|
||||
self.mail_compose = self.env["mail.compose.message"].create(
|
||||
{"template_id": self.mt.id, "composition_mode": "mass_mail"}
|
||||
)
|
||||
self.partners = self.env['res.partner'].search([])
|
||||
self.partners = self.env["res.partner"].search([])
|
||||
|
||||
def test_get_email_template(self):
|
||||
self.assertEqual(
|
||||
self.mt._get_substitution_template(
|
||||
self.env.ref('base.model_res_partner'), self.partners.ids
|
||||
self.env.ref("base.model_res_partner"), self.partners.ids
|
||||
),
|
||||
self.smt1,
|
||||
)
|
||||
self.assertEqual(
|
||||
self.mt.get_email_template(self.partners.ids).get(
|
||||
self.partners.ids[0]
|
||||
),
|
||||
self.mt.get_email_template(self.partners.ids).get(self.partners.ids[0]),
|
||||
self.smt1,
|
||||
)
|
||||
|
||||
|
|
@ -61,13 +59,13 @@ class TestMailTemplateSubstitute(TransactionCase):
|
|||
self.assertEqual(
|
||||
self.mail_compose.with_context(
|
||||
active_ids=self.partners.ids
|
||||
)._get_substitution_template('mass_mail', self.mt, None),
|
||||
)._get_substitution_template("mass_mail", self.mt, None),
|
||||
self.smt1,
|
||||
)
|
||||
|
||||
def test_onchange_template_id_wrapper(self):
|
||||
self.assertEqual(self.mail_compose.template_id, self.mt)
|
||||
self.smt1.mail_template_substitution_rule_ids.domain = '[]'
|
||||
self.smt1.mail_template_substitution_rule_ids.domain = "[]"
|
||||
self.mail_compose.with_context(
|
||||
active_ids=self.partners.ids
|
||||
).onchange_template_id_wrapper()
|
||||
|
|
|
|||
|
|
@ -1,36 +1,46 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!-- Copyright 2019 ACSONE SA/NV
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record model="ir.ui.view" id="email_template_form">
|
||||
<field name="name">mail.template.form (in mail_template_substitute)
|
||||
</field>
|
||||
<field name="model">mail.template</field>
|
||||
<field name="inherit_id" ref="mail.email_template_form"/>
|
||||
<field name="inherit_id" ref="mail.email_template_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//notebook" position="inside">
|
||||
<page name="mail_template_substitution_rule" string="Substitution Rules">
|
||||
<page
|
||||
name="mail_template_substitution_rule"
|
||||
string="Substitution Rules"
|
||||
>
|
||||
<field name="mail_template_substitution_rule_ids">
|
||||
<tree>
|
||||
<field name="sequence" widget="handle"/>
|
||||
<field name="substitution_mail_template_id"/>
|
||||
<field name="domain"/>
|
||||
<field name="sequence" widget="handle" />
|
||||
<field name="substitution_mail_template_id" />
|
||||
<field name="domain" />
|
||||
</tree>
|
||||
<form>
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="mail_template_id"
|
||||
invisible="1" readonly="1"
|
||||
required="0"/>
|
||||
<field name="model" invisible="1"/>
|
||||
<field name="substitution_mail_template_id"
|
||||
domain="[('model', '=', model), ('id', '!=', parent.id)]"/>
|
||||
<field
|
||||
name="mail_template_id"
|
||||
invisible="1"
|
||||
readonly="1"
|
||||
required="0"
|
||||
/>
|
||||
<field name="model" invisible="1" />
|
||||
<field
|
||||
name="substitution_mail_template_id"
|
||||
domain="[('model', '=', model), ('id', '!=', parent.id)]"
|
||||
/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="domain" widget="domain"
|
||||
options="{'model': 'model'}"/>
|
||||
<field
|
||||
name="domain"
|
||||
widget="domain"
|
||||
options="{'model': 'model'}"
|
||||
/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -6,15 +6,13 @@ from odoo import api, models
|
|||
|
||||
class MailComposeMessage(models.TransientModel):
|
||||
|
||||
_inherit = 'mail.compose.message'
|
||||
_inherit = "mail.compose.message"
|
||||
|
||||
@api.model
|
||||
def _get_substitution_template(self, composition_mode, template, res_ids):
|
||||
if template:
|
||||
if composition_mode == 'mass_mail' and self.env.context.get(
|
||||
'active_ids'
|
||||
):
|
||||
res_ids = self.env.context.get('active_ids')
|
||||
if composition_mode == "mass_mail" and self.env.context.get("active_ids"):
|
||||
res_ids = self.env.context.get("active_ids")
|
||||
res_ids_to_templates = template.get_email_template(res_ids)
|
||||
if res_ids_to_templates:
|
||||
return list(res_ids_to_templates.values())[0]
|
||||
|
|
@ -24,16 +22,16 @@ class MailComposeMessage(models.TransientModel):
|
|||
def default_get(self, fields):
|
||||
result = super(MailComposeMessage, self).default_get(fields)
|
||||
substitution_template = self._get_substitution_template(
|
||||
result.get('composition_mode'),
|
||||
self.env['mail.template'].browse(result.get('template_id')),
|
||||
[result.get('res_id')],
|
||||
result.get("composition_mode"),
|
||||
self.env["mail.template"].browse(result.get("template_id")),
|
||||
[result.get("res_id")],
|
||||
)
|
||||
if substitution_template:
|
||||
result['template_id'] = substitution_template.id
|
||||
result["template_id"] = substitution_template.id
|
||||
return result
|
||||
|
||||
@api.multi
|
||||
@api.onchange('template_id')
|
||||
@api.onchange("template_id")
|
||||
def onchange_template_id_wrapper(self):
|
||||
substitution_template = self._get_substitution_template(
|
||||
self.composition_mode, self.template_id, [self.res_id]
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
../../../../mail_template_substitute
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
import setuptools
|
||||
|
||||
setuptools.setup(
|
||||
setup_requires=['setuptools-odoo'],
|
||||
odoo_addon=True,
|
||||
)
|
||||
Loading…
Reference in New Issue