diff options
| author | Kishan Gajjar <kishanegajjar@gmail.com> | 2019-08-30 09:57:19 +0000 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2019-10-02 10:14:12 +0000 |
| commit | 083c5bddb703d7c3d87f831e8fe1ff2136ffed79 (patch) | |
| tree | 31baef7ecf3c7f65da4e6631b11eac9ca8dddf5e /addons/website/models | |
| parent | f96d6a9911b50f7a143b006ad6f6d02e3a6fe925 (diff) | |
[IMP] social_media, website_*: remove google+ mention
Google+ was shut down for business use and consumers.
closes odoo/odoo#36271
See: https://plus.google.com/
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Diffstat (limited to 'addons/website/models')
| -rw-r--r-- | addons/website/models/res_config_settings.py | 6 | ||||
| -rw-r--r-- | addons/website/models/website.py | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/addons/website/models/res_config_settings.py b/addons/website/models/res_config_settings.py index 0fff2f6eb3b..95c84dea10e 100644 --- a/addons/website/models/res_config_settings.py +++ b/addons/website/models/res_config_settings.py @@ -44,13 +44,12 @@ class ResConfigSettings(models.TransientModel): social_github = fields.Char(related='website_id.social_github', readonly=False) social_linkedin = fields.Char(related='website_id.social_linkedin', readonly=False) social_youtube = fields.Char(related='website_id.social_youtube', readonly=False) - social_googleplus = fields.Char(related='website_id.social_googleplus', readonly=False) social_instagram = fields.Char(related='website_id.social_instagram', readonly=False) - @api.depends('website_id', 'social_twitter', 'social_facebook', 'social_github', 'social_linkedin', 'social_youtube', 'social_googleplus', 'social_instagram') + @api.depends('website_id', 'social_twitter', 'social_facebook', 'social_github', 'social_linkedin', 'social_youtube', 'social_instagram') def has_social_network(self): self.has_social_network = self.social_twitter or self.social_facebook or self.social_github \ - or self.social_linkedin or self.social_youtube or self.social_googleplus or self.social_instagram + or self.social_linkedin or self.social_youtube or self.social_instagram def inverse_has_social_network(self): if not self.has_social_network: @@ -59,7 +58,6 @@ class ResConfigSettings(models.TransientModel): self.social_github = '' self.social_linkedin = '' self.social_youtube = '' - self.social_googleplus = '' self.social_instagram = '' has_social_network = fields.Boolean("Configure Social Network", compute=has_social_network, inverse=inverse_has_social_network) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index f8d8d652e72..2cfd7ab7a28 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -72,9 +72,6 @@ class Website(models.Model): def _default_social_youtube(self): return self.env.ref('base.main_company').social_youtube - def _default_social_googleplus(self): - return self.env.ref('base.main_company').social_googleplus - def _default_social_instagram(self): return self.env.ref('base.main_company').social_instagram @@ -92,7 +89,6 @@ class Website(models.Model): social_github = fields.Char('GitHub Account', default=_default_social_github) social_linkedin = fields.Char('LinkedIn Account', default=_default_social_linkedin) social_youtube = fields.Char('Youtube Account', default=_default_social_youtube) - social_googleplus = fields.Char('Google+ Account', default=_default_social_googleplus) social_instagram = fields.Char('Instagram Account', default=_default_social_instagram) social_default_image = fields.Binary(string="Default Social Share Image", help="If set, replaces the company logo as the default social share image.") |