pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christophe Simonis
2017-03-06 11:29:04 +01:00
parent 8ecec2bfbb 9ff0eb0586
commit ea527cc3fc
6 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/google_drive/static/src/css/google_drive.css
+5
View File
@@ -0,0 +1,5 @@
li.oe_share_gdoc > a:after {
content: url('/google_drive/static/src/img/drive_icon.png');
position: absolute;
right: 5px;
}
addons/google_drive/static/src/img/drive_icon.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

addons/google_drive/static/src/js/gdrive.js
+1 -1
View File
@@ -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,
addons/google_drive/views/google_drive.xml
+1
View File
@@ -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>
addons/website_slides/security/ir.model.access.csv
+1 -1
View File
@@ -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
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_slide_slide_public slide.slide.public model_slide_slide base.group_public 1 0 0 0
3 access_slide_slide_portal slide.slide.portal model_slide_slide base.group_portal 1 1 0 1 0 0
4 access_slide_slide_user slide.slide.user model_slide_slide base.group_user 1 1 1 1
5 access_slide_tag_public slide.tag.public model_slide_tag base.group_public 1 0 0 0
6 access_slide_tag_portal slide.tag.portal model_slide_tag base.group_portal 1 0 0 0
addons/website_slides/security/website_slides_security.xml
+2 -2
View File
@@ -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>