[MERGE] forward port branch saas-6 up to 9ff0eb05862

6 files changed, 10 insertions, 4 deletions

diff --git a/addons/google_drive/static/src/css/google_drive.css b/addons/google_drive/static/src/css/google_drive.css
new file mode 100644
index 00000000000..ce2b22599b0
--- /dev/null
+++ b/addons/google_drive/static/src/css/google_drive.css
@@ -0,0 +1,5 @@
+li.oe_share_gdoc > a:after {
+    content: url('/google_drive/static/src/img/drive_icon.png');
+    position: absolute;
+    right: 5px;
+}
diff --git a/addons/google_drive/static/src/img/drive_icon.png b/addons/google_drive/static/src/img/drive_icon.png
index 590dde867f4..1553aa319a6 100644
--- a/addons/google_drive/static/src/img/drive_icon.png
+++ b/addons/google_drive/static/src/img/drive_icon.png
diff --git a/addons/google_drive/static/src/js/gdrive.js b/addons/google_drive/static/src/js/gdrive.js
index bc7449c5507..6da06dcd8ec 100644
--- a/addons/google_drive/static/src/js/gdrive.js
+++ b/addons/google_drive/static/src/js/gdrive.js
@@ -41,7 +41,7 @@ Sidebar.include({
                             }
                             if (!already_there){
                                 self.add_items('other', [{
-                                        label: res.name+ '<img style="position:absolute;right:5px;height:20px;width:20px;" title="Google Drive" src="google_drive/static/src/img/drive_icon.png"/>',
+                                        label: res.name,
                                         config_id: res.id,
                                         res_id: res_id,
                                         res_model: view.dataset.model,
diff --git a/addons/google_drive/views/google_drive.xml b/addons/google_drive/views/google_drive.xml
index 9d14fa463cc..70cc5dc2208 100644
--- a/addons/google_drive/views/google_drive.xml
+++ b/addons/google_drive/views/google_drive.xml
@@ -3,6 +3,7 @@
     <data>
         <template id="assets_backend" name="google_drive assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/google_drive/static/src/css/google_drive.css" />
                 <script type="text/javascript" src="/google_drive/static/src/js/gdrive.js"></script>
             </xpath>
         </template>
diff --git a/addons/website_slides/security/ir.model.access.csv b/addons/website_slides/security/ir.model.access.csv
index 39d871b2863..07d087f7db9 100644
--- a/addons/website_slides/security/ir.model.access.csv
+++ b/addons/website_slides/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_slide_slide_public,slide.slide.public,model_slide_slide,base.group_public,1,0,0,0
-access_slide_slide_portal,slide.slide.portal,model_slide_slide,base.group_portal,1,1,1,0
+access_slide_slide_portal,slide.slide.portal,model_slide_slide,base.group_portal,1,0,0,0
 access_slide_slide_user,slide.slide.user,model_slide_slide,base.group_user,1,1,1,1
 access_slide_tag_public,slide.tag.public,model_slide_tag,base.group_public,1,0,0,0
 access_slide_tag_portal,slide.tag.portal,model_slide_tag,base.group_portal,1,0,0,0
diff --git a/addons/website_slides/security/website_slides_security.xml b/addons/website_slides/security/website_slides_security.xml
index c34ab413263..1b09a2955bb 100644
--- a/addons/website_slides/security/website_slides_security.xml
+++ b/addons/website_slides/security/website_slides_security.xml
@@ -17,7 +17,7 @@
         <record id="rule_slide_channel_public" model="ir.rule">
             <field name="name">Channel: public: published only</field>
             <field name="model_id" ref="model_slide_channel"/>
-            <field name="groups" eval="[(4, ref('base.group_public'))]"/>
+            <field name="groups" eval="[(4, ref('base.group_public')) ,(4, ref('base.group_portal'))]"/>
             <field name="domain_force">[('website_published', '=', True)]</field>
         </record>
 
@@ -36,7 +36,7 @@
         <record id="rule_slide_slide_public" model="ir.rule">
             <field name="name">Slide: public: published only</field>
             <field name="model_id" ref="model_slide_slide"/>
-            <field name="groups" eval="[(4, ref('base.group_public'))]"/>
+            <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/>
             <field name="domain_force">[('channel_id.website_published', '=', True), ('website_published', '=', True)]</field>
         </record>
     </data>