From 083c5bddb703d7c3d87f831e8fe1ff2136ffed79 Mon Sep 17 00:00:00 2001 From: Kishan Gajjar Date: Fri, 30 Aug 2019 09:57:19 +0000 Subject: [PATCH] [IMP] social_media, website_*: remove google+ mention MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- addons/social_media/demo/res_company_demo.xml | 1 - addons/social_media/models/res_company.py | 1 - .../social_media/views/res_company_views.xml | 1 - addons/website/models/res_config_settings.py | 6 ++---- addons/website/models/website.py | 4 ---- .../static/src/img/snippets_thumbs/s_share.png | Bin 1189 -> 612 bytes .../src/js/content/snippets.animation.js | 4 +--- .../views/res_config_settings_views.xml | 4 ---- addons/website/views/snippets.xml | 3 --- addons/website/views/website_templates.xml | 1 - .../website_blog/static/src/js/website_blog.js | 4 ---- .../views/website_blog_components.xml | 2 -- .../views/snippets_templates.xml | 5 ----- 13 files changed, 3 insertions(+), 33 deletions(-) mode change 100755 => 100644 addons/website/static/src/img/snippets_thumbs/s_share.png diff --git a/addons/social_media/demo/res_company_demo.xml b/addons/social_media/demo/res_company_demo.xml index b095436bc60..7a62347e2bc 100644 --- a/addons/social_media/demo/res_company_demo.xml +++ b/addons/social_media/demo/res_company_demo.xml @@ -3,7 +3,6 @@ https://twitter.com/Odoo https://www.facebook.com/Odoo - https://plus.google.com/+Odooapps https://www.linkedin.com/company/odoo https://www.youtube.com/user/OpenERPonline https://github.com/odoo diff --git a/addons/social_media/models/res_company.py b/addons/social_media/models/res_company.py index a8dab798abb..6eb79ca0ddb 100644 --- a/addons/social_media/models/res_company.py +++ b/addons/social_media/models/res_company.py @@ -12,5 +12,4 @@ class Company(models.Model): social_github = fields.Char('GitHub Account') social_linkedin = fields.Char('LinkedIn Account') social_youtube = fields.Char('Youtube Account') - social_googleplus = fields.Char('Google+ Account') social_instagram = fields.Char('Instagram Account') diff --git a/addons/social_media/views/res_company_views.xml b/addons/social_media/views/res_company_views.xml index ae744abc4e4..1e48f713ac6 100644 --- a/addons/social_media/views/res_company_views.xml +++ b/addons/social_media/views/res_company_views.xml @@ -13,7 +13,6 @@ - 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.") diff --git a/addons/website/static/src/img/snippets_thumbs/s_share.png b/addons/website/static/src/img/snippets_thumbs/s_share.png old mode 100755 new mode 100644 index b1a7431d0b1a815e26e46369f2f348ede5542679..3ace714f8b8451cee62d188cfd6d486e3409d49e GIT binary patch delta 598 zcmV-c0;&C_3FHKj8Gi!+007w6Al(1}00DDSM?wMF$t-^W000SaNLh0L01FcU01FcV z0GgZ_0000;P)t-s|NsBb-{y#}z<{Z|@AUVu$<^27>fh?_z|`KDxyg{U#OLqwpuf$y z&)N6-`>4dxf~vjP)P zAP_~l$W_oLHR=EVX`zM$6^t1rZP((wC=AYq5o8dds;a80sy`@9=t2Z+eNl&)Kwk`Ts)kdYMzQECk$e2suY^exscLanhm2t&IdUH|AQvLpj>X09gVd<}xI zzCX)yBXN+P!ha#sUAZ)o-wed;fi$y<5)cuU+cf0fghL@DqSz-8_&Q;2D0but#DXEJ z3q?lL5M_+(h&6_QA(Y6mglPt{|HV_n#`$GwF$fu_aECQ52k{(ZbnLJQWUjYBnuK)+ zWc&7ehrGW1Zciiv1dvEnRaHHgTCPR6MFs0YS$+E36@RS1nAJld1TUg;JOn@X_M#BJ z0{J*5T%50k>l8QVP{>L^mM)7yT2mv%bLJNr3oX_S2*1&1IwdVdzzZ z_CvgPlTU;obS30EttkLO`I>(N`I@ZwQ=yUMzXz{Cm=KIAAujIzb~zrh;wEi9_*c|H k+wWTviK?oqs;W2W8#en+a07*qoM6N<$f->$Re*gdg delta 1180 zcmV;N1Y`T;1f>a(8Gix*003ZXN4Nk002y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00c)#L_t(|+U%Q6OB+!XhGWqZ(ZB@SG_6>ZLSsQN(S-^YY&ZH7T)Oo4 zxa`uUOQBt)8x<<33ynfrn?Mp3NlX?qV8oz;eP^z{jhPrtW`FKYW_k{@n0(C5oM-NN z&;2;*y1l*ikUh^Z{=je{E|=eO+hDcq&!d-HZ&|yjbXFL4f+5_72VQ!g>rNdN zwe@6%y|46n34hi-TlhR4dg;ISR+6&e1AVHNR3~Rca~g_;^`O9cK`n2mkL?nUx)u%J z<-5bv(nc~{(9RtLE2#Jo6ySxMhQ3Zk27~_o<+WW2U2H#>7eq=3EHDBo?c#EE=NG$g z=xgQbMov6hOr5ed3(*H&@kE+GVFaMr2LMF}{7*;l+<%x(<%%koUZt;>odX{<1syFG zdILS4j0_$XRSeK=%zz7@#<_T{Y#um6;JLk0d=M<0z$eM-4_e+%!?Al~RJ`dRUz=YPP|` z_`u@j4=vGIZ@J@O&5cD`zAd(`Aiw2it&3_(Nq^u87QrG|1dCu10)i#PY#ZHv`MzUi z4=Skm7H22we&oU`8jHJi4K8octn>(%YgYBVmum#u)RALs!$REN zy+`Q2p^a-J+>}1AdD)8<3~*TSL^`PSi&)XNU$YQ>ho>bRBD&S$?BoYy6QtVaKaTQB z0DrwE#n_Y<@u-Ash1tGueh#R|;AeNAE2+7n$|@T? z`l|6IoScdbvi-56qPCSfZq}vk)XB_97@CL!o%c*Dv#m+<(99W{1yb-wKTCQHSiS5e zyo!eZ)#u@4c;LnI+HSMF(4p7@G~yA*jDIKW!s!m^;D7-0@PWRV1*owN1(ZjtX~iW( zse@8TK4wKr-!>18;t|97<_bYqejL<|yK37P6N6G=>4hPG-QfN-TXc;^_Op!&A#2J{ zoC>SjLo2DOpp|)boV^oC7cSATs*{amwr&zk2#Z0F6aO@T(I(PD)U@gnPozZGp?`Ec z3)58OZB#E(^;So;QTv{eu>0>MSm3gr%-{gEpx?&^x-u&y?1u#hSa!z=n|ZL81+`o~ z9WlSz6g6?>eNti7s4OqHtr2NCf4Ha_^t(SBimT6Q8!U@|muPS~Rna)oXy1@v5iEj5 uum~0z!6H}$i(nBff<;EKny^0t3>5$e7EbFIag)jb0000 -
-
diff --git a/addons/website_mass_mailing/views/snippets_templates.xml b/addons/website_mass_mailing/views/snippets_templates.xml index 44f7c20a21f..bbc1bab2bec 100644 --- a/addons/website_mass_mailing/views/snippets_templates.xml +++ b/addons/website_mass_mailing/views/snippets_templates.xml @@ -90,11 +90,6 @@ - - - - -