diff options
| author | Victor Feyens <vfe@odoo.com> | 2020-02-07 13:42:17 +0000 |
|---|---|---|
| committer | Victor Feyens <vfe@odoo.com> | 2020-02-11 13:07:06 +0000 |
| commit | d4e0fe018d05fd0dc3e9ab77977d6e97440c73c0 (patch) | |
| tree | db7191da6d78af6abf72548e60ae924153360c63 /addons/mass_mailing/data | |
| parent | a247d643777c5aa5e3804bb6f07a7ba1d5753d26 (diff) | |
[IMP] *: use `ref=` instead of `eval="ref('` in xml field tags.
* Code cleanup
* Avoid a safe evaluation of the field value when loading those records.
closes odoo/odoo#44883
Related: odoo/enterprise#8283
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
Diffstat (limited to 'addons/mass_mailing/data')
| -rw-r--r-- | addons/mass_mailing/data/mass_mailing_demo.xml | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index e2768d2ae16..802a1ec6b4c 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -40,8 +40,8 @@ <!-- Create Opt-out Records --> <record id="mass_mail_contact_list_rel_1" model="mailing.contact.subscription"> - <field name="list_id" eval="ref('mass_mailing.mass_mail_list_2')"/> - <field name="contact_id" eval="ref('mass_mailing.mass_mail_contact_4')"/> + <field name="list_id" ref="mass_mailing.mass_mail_list_2"/> + <field name="contact_id" ref="mass_mailing.mass_mail_contact_4"/> <field name="opt_out">True</field> </record> @@ -57,7 +57,7 @@ <record id="mass_mail_campaign_1" model="utm.campaign"> <field name="name">Newsletter</field> <field name="stage_id" ref="utm.campaign_stage_1"/> - <field name="user_id" eval="ref('base.user_admin')"/> + <field name="user_id" ref="base.user_admin"/> <field name="tag_ids" eval="[(6,0,[ref('utm.utm_tag_1')])]"/> </record> @@ -65,10 +65,10 @@ <field name="name">Newsletter 1</field> <field name="subject" eval="'%s Newsletter' % (DateTime.today().strftime('%B'))"/> <field name="state">done</field> - <field name="user_id" eval="ref('base.user_admin')"/> + <field name="user_id" ref="base.user_admin"/> <field name="email_from">info@yourcompany.example.com</field> <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/> - <field name="campaign_id" eval="ref('mass_mail_campaign_1')"/> + <field name="campaign_id" ref="mass_mail_campaign_1"/> <field name="source_id" ref="mass_mailing.utm_source_0"/> <field name="mailing_model_id" ref="base.model_res_partner"/> <field name="mailing_domain" eval="[('parent_id', '=', ref('base.res_partner_4'))]"/> @@ -132,7 +132,6 @@ <tr> <td class="o_mail_footer_links o_default_snippet_text" style="padding:10px 0 10px 0;text-align:center;vertical-align:middle;"> <a href="/unsubscribe_from_list" class="btn btn-link o_default_snippet_text" style="text-decoration:none;border-radius:0.25rem;border-style:solid;padding:0px;cursor:pointer;line-height:1.5;font-size:12px;border-left-color:transparent;border-bottom-color:transparent;border-right-color:transparent;border-top-color:transparent;border-left-width:1px;border-bottom-width:1px;border-right-width:1px;border-top-width:1px;user-select:none;vertical-align:middle;white-space:nowrap;text-align:center;font-weight:bold;display:inline-block;background-color:transparent;color:rgb(100, 89, 116);">Unsubscribe</a> | - <a href="/contactus" class="btn btn-link o_default_snippet_text" style="text-decoration:none;border-radius:0.25rem;border-style:solid;padding:0px;cursor:pointer;line-height:1.5;font-size:12px;border-left-color:transparent;border-bottom-color:transparent;border-right-color:transparent;border-top-color:transparent;border-left-width:1px;border-bottom-width:1px;border-right-width:1px;border-top-width:1px;user-select:none;vertical-align:middle;white-space:nowrap;text-align:center;font-weight:bold;display:inline-block;background-color:transparent;color:rgb(100, 89, 116);">Contact</a> </td> </tr> @@ -168,7 +167,7 @@ <function model="mailing.mailing" name="convert_links" eval="[ref('mass_mailing.mass_mail_1')]"/> <record id="mass_mail_1_stat_0" model="mailing.trace"> - <field name="mass_mailing_id" eval="ref('mass_mail_1')"/> + <field name="mass_mailing_id" ref="mass_mail_1"/> <field name="message_id">1111000@odoo.com</field> <field name="model">res.partner</field> <field name="res_id" ref="base.res_partner_address_7"/> @@ -178,7 +177,7 @@ <field name="replied" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/> </record> <record id="mass_mail_1_stat_1" model="mailing.trace"> - <field name="mass_mailing_id" eval="ref('mass_mail_1')"/> + <field name="mass_mailing_id" ref="mass_mail_1"/> <field name="message_id">1111001@odoo.com</field> <field name="model">res.partner</field> <field name="res_id" ref="base.res_partner_address_13"/> @@ -188,7 +187,7 @@ <field name="replied" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M:%S')"/> </record> <record id="mass_mail_1_stat_2" model="mailing.trace"> - <field name="mass_mailing_id" eval="ref('mass_mail_1')"/> + <field name="mass_mailing_id" ref="mass_mail_1"/> <field name="message_id">1111002@odoo.com</field> <field name="model">res.partner</field> <field name="res_id" ref="base.res_partner_address_14"/> @@ -197,7 +196,7 @@ <field name="opened" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/> </record> <record id="mass_mail_1_stat_3" model="mailing.trace"> - <field name="mass_mailing_id" eval="ref('mass_mail_1')"/> + <field name="mass_mailing_id" ref="mass_mail_1"/> <field name="message_id">1111003@odoo.com</field> <field name="model">res.partner</field> <field name="res_id" ref="base.res_partner_address_24"/> @@ -206,7 +205,7 @@ <field name="opened" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/> </record> <record id="mass_mail_1_stat_4" model="mailing.trace"> - <field name="mass_mailing_id" eval="ref('mass_mail_1')"/> + <field name="mass_mailing_id" ref="mass_mail_1"/> <field name="message_id">1111004@odoo.com</field> <field name="model">res.partner</field> <field name="res_id" ref="base.res_partner_address_32"/> @@ -214,7 +213,7 @@ <field name="sent" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/> </record> <record id="mass_mail_1_stat_5" model="mailing.trace"> - <field name="mass_mailing_id" eval="ref('mass_mail_1')"/> + <field name="mass_mailing_id" ref="mass_mail_1"/> <field name="message_id">1111004@odoo.com</field> <field name="model">res.partner</field> <field name="res_id" ref="base.res_partner_address_33"/> @@ -223,7 +222,7 @@ <field name="exception" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/> </record> <record id="mass_mail_1_stat_6" model="mailing.trace"> - <field name="mass_mailing_id" eval="ref('mass_mail_1')"/> + <field name="mass_mailing_id" ref="mass_mail_1"/> <field name="message_id">1111004@odoo.com</field> <field name="model">res.partner</field> <field name="res_id" ref="base.res_partner_address_34"/> |
