From 9624ef2907b34464383f857b351144eb45afb346 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Wed, 27 Oct 2010 13:24:28 +0300
Subject: document: ACL setup, based on ir.rules

bzr revid: p_christ@hol.gr-20101027102428-pyanpwxzhta3zqy3
---
 addons/document/security/document_security.xml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'addons/document/security/document_security.xml')

diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 2bf1a2adb57..e1a60165150 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -14,6 +14,28 @@
         <field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
     </record>
 
-
+    <record id="ir_rule_readpublicdirectories0" model="ir.rule">
+        <field name="model_id" ref="document.model_document_directory"/>
+        <field name="domain_force">['|',('user_id', '=', False), ('user_id', '=', user.id), '|', ('group_ids','=',False), ('group_ids','in',user.groups_id), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])]</field>
+        <field name="name">Read public directories</field>
+        <field eval="0" name="global"/>
+        <field eval="[(6,0,[ref('base.group_user')])]" name="groups"/>
+        <field eval="0" name="perm_unlink"/>
+        <field eval="0" name="perm_write"/>
+        <field eval="1" name="perm_read"/>
+        <field eval="0" name="perm_create"/>
+    </record>
+    
+    <record id="ir_rule_documentmodifyowndirectories0" model="ir.rule">
+        <field name="model_id" ref="document.model_document_directory"/>
+        <field name="domain_force">[('user_id', '=', user.id), '|', ('group_ids','=',False), ('group_ids','in',user.groups_id), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]) ]</field>
+        <field name="name">Document modify own directories</field>
+        <field eval="0" name="global"/>
+        <field eval="[(6,0,[ref('base.group_document_user')])]" name="groups"/>
+        <field eval="1" name="perm_unlink"/>
+        <field eval="1" name="perm_write"/>
+        <field eval="0" name="perm_read"/>
+        <field eval="1" name="perm_create"/>
+    </record>
 </data>
 </openerp>
-- 
cgit v1.2.3


From aed35b4545f058b8aa43da11fdf7040c56cdbc46 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <p_christ@hol.gr>
Date: Wed, 3 Nov 2010 13:26:04 +0200
Subject: document: fix security rules

The behaviour didn't match the intended one as in the documentation.

bzr revid: p_christ@hol.gr-20101103112604-slw7gb04wlw2amim
---
 addons/document/security/document_security.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/document/security/document_security.xml')

diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index e1a60165150..c4ef727894a 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -16,7 +16,7 @@
 
     <record id="ir_rule_readpublicdirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>
-        <field name="domain_force">['|',('user_id', '=', False), ('user_id', '=', user.id), '|', ('group_ids','=',False), ('group_ids','in',user.groups_id), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('group_ids','in',user.groups_id), ('user_id', '=', user.id), '&amp;', ('user_id', '=', False), ('group_ids','=',False),  '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])]</field>
         <field name="name">Read public directories</field>
         <field eval="0" name="global"/>
         <field eval="[(6,0,[ref('base.group_user')])]" name="groups"/>
@@ -28,7 +28,7 @@
     
     <record id="ir_rule_documentmodifyowndirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>
-        <field name="domain_force">[('user_id', '=', user.id), '|', ('group_ids','=',False), ('group_ids','in',user.groups_id), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]) ]</field>
+        <field name="domain_force">[ '|', ('user_id', '=', user.id), '&amp;', ('group_ids','in',user.groups_id), ('user_id','=',False), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]) ]</field>
         <field name="name">Document modify own directories</field>
         <field eval="0" name="global"/>
         <field eval="[(6,0,[ref('base.group_document_user')])]" name="groups"/>
-- 
cgit v1.2.3


From d3b79b05fcbcbd0da299c09f96edc4d1ac698cc0 Mon Sep 17 00:00:00 2001
From: "xrg@hellug.gr" <>
Date: Thu, 4 Nov 2010 17:44:46 +0200
Subject: document: fix security rules, for trunk ORM

browse lists are not correctly resolved at v600 ORM, so avoid them with a pythonic expression.

bzr revid: xrg@hellug.gr-20101104154446-c8ocgye52w6m5ufn
---
 addons/document/security/document_security.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/document/security/document_security.xml')

diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index c4ef727894a..ca55a8219c1 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -16,7 +16,7 @@
 
     <record id="ir_rule_readpublicdirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>
-        <field name="domain_force">['|','|',('group_ids','in',user.groups_id), ('user_id', '=', user.id), '&amp;', ('user_id', '=', False), ('group_ids','=',False),  '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('group_ids','in',[g.id for g in user.groups_id]), ('user_id', '=', user.id), '&amp;', ('user_id', '=', False), ('group_ids','=',False),  '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])]</field>
         <field name="name">Read public directories</field>
         <field eval="0" name="global"/>
         <field eval="[(6,0,[ref('base.group_user')])]" name="groups"/>
@@ -28,7 +28,7 @@
     
     <record id="ir_rule_documentmodifyowndirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>
-        <field name="domain_force">[ '|', ('user_id', '=', user.id), '&amp;', ('group_ids','in',user.groups_id), ('user_id','=',False), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]) ]</field>
+        <field name="domain_force">[ '|', ('user_id', '=', user.id), '&amp;', ('group_ids','in',[g.id for g in user.groups_id]), ('user_id','=',False), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])]</field>
         <field name="name">Document modify own directories</field>
         <field eval="0" name="global"/>
         <field eval="[(6,0,[ref('base.group_document_user')])]" name="groups"/>
-- 
cgit v1.2.3