From 3952fbd15f373c230e26fbd476f4f27ea8356043 Mon Sep 17 00:00:00 2001 From: "Guillaume (gdi)" Date: Mon, 24 Apr 2023 07:38:55 +0000 Subject: [PATCH] [IMP] mass_mailing, *: add TikTok to templates *: mass_mailing_themes, website_mass_mailing This commit adds TikTok to the already existing social networks in all email marketing templates (droppable blocks and default mail templates). task-3235451 closes odoo/odoo#116837 Signed-off-by: Arthur Detroux (ard) --- addons/mass_mailing/models/res_company.py | 3 ++- addons/mass_mailing/views/snippets_themes.xml | 3 +++ .../views/mass_mailing_themes_templates.xml | 19 +++++++++++++++++++ .../models/res_company.py | 3 ++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/addons/mass_mailing/models/res_company.py b/addons/mass_mailing/models/res_company.py index 39865fe4388..8c1088e50a9 100644 --- a/addons/mass_mailing/models/res_company.py +++ b/addons/mass_mailing/models/res_company.py @@ -13,5 +13,6 @@ class ResCompany(models.Model): 'social_facebook': self.social_facebook, 'social_linkedin': self.social_linkedin, 'social_twitter': self.social_twitter, - 'social_instagram': self.social_instagram + 'social_instagram': self.social_instagram, + 'social_tiktok': self.social_tiktok, } diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml index cb18c8bf4ed..29f6e43f1c5 100644 --- a/addons/mass_mailing/views/snippets_themes.xml +++ b/addons/mass_mailing/views/snippets_themes.xml @@ -250,6 +250,9 @@    +    + + diff --git a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml index 5bf51218db3..e328d02b1ac 100644 --- a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml +++ b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml @@ -54,6 +54,9 @@    +    + + @@ -201,6 +204,10 @@     + + + +     @@ -430,6 +437,9 @@    +    + + @@ -617,6 +627,9 @@    +    + + @@ -719,6 +732,9 @@    ​ +    + + ​ @@ -856,6 +872,9 @@    +    + +

diff --git a/addons/website_mass_mailing/models/res_company.py b/addons/website_mass_mailing/models/res_company.py index 892eea99c48..91f7ef2cc16 100644 --- a/addons/website_mass_mailing/models/res_company.py +++ b/addons/website_mass_mailing/models/res_company.py @@ -14,6 +14,7 @@ class ResCompany(models.Model): 'social_facebook': website_id.social_facebook or social_media_links.get('social_facebook'), 'social_linkedin': website_id.social_linkedin or social_media_links.get('social_linkedin'), 'social_twitter': website_id.social_twitter or social_media_links.get('social_twitter'), - 'social_instagram': website_id.social_instagram or social_media_links.get('social_instagram') + 'social_instagram': website_id.social_instagram or social_media_links.get('social_instagram'), + 'social_tiktok': website_id.social_tiktok or social_media_links.get('social_tiktok'), }) return social_media_links