diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-09-17 12:27:40 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-09-17 12:27:40 +0530 |
| commit | e6cdcb6b51d49539a33d4d32d79f8ba07467bdbd (patch) | |
| tree | 4147ec7e183e9488012197c52ac755435e1ad027 /addons/note/security | |
| parent | ca38083f17c2f9b0e4f58b5e6102fbc5f9e2f791 (diff) | |
| parent | cd644106f30d303738fdd0a04b9b15e5e4a33bbf (diff) | |
[MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120917065740-w9a3xhe632368t2n
Diffstat (limited to 'addons/note/security')
| -rw-r--r-- | addons/note/security/ir.model.access.csv | 5 | ||||
| -rw-r--r-- | addons/note/security/ir.rule.xml | 12 | ||||
| -rw-r--r-- | addons/note/security/note_security.xml | 12 | ||||
| -rw-r--r-- | addons/note/security/res.groups.csv | 3 |
4 files changed, 18 insertions, 14 deletions
diff --git a/addons/note/security/ir.model.access.csv b/addons/note/security/ir.model.access.csv index fdd6030ca51..cbe11cba94e 100644 --- a/addons/note/security/ir.model.access.csv +++ b/addons/note/security/ir.model.access.csv @@ -1,3 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_note_stage_user,note.stage user,model_note_stage,base.group_user,1,1,1,1
-access_note_note_user,note.note user,model_note_note,base.group_user,1,1,1,1
+access_note_stage,note.stage,model_note_stage,base.group_user,1,1,1,1
+access_note_note,note.note,model_note_note,base.group_user,1,1,1,1
+access_note_tag,note.tag,model_note_tag,base.group_user,1,1,1,1
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml new file mode 100644 index 00000000000..3d2f0d242f6 --- /dev/null +++ b/addons/note/security/ir.rule.xml @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<openerp> +<data> + <record id="note_note_rule_global" model="ir.rule"> + <field name="name">Only followers can access a sticky notes</field> + <field model="ir.model" ref="model_note_note" name="model_id"/> + <field name="domain_force">['|',('message_follower_ids','=',False),('message_follower_ids','=',user.partner_id.id)]</field> + <field eval="True" name="global"/> + </record> +</data> +</openerp> + diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml deleted file mode 100644 index 46eebee629c..00000000000 --- a/addons/note/security/note_security.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<openerp> -<data> - <record id="note_note_global" model="ir.rule"> - <field name="name">My notes</field> - <field ref="model_note_note" name="model_id"/> - <field eval="1" name="global"/> - <field name="domain_force">[('follower_ids','=',user.id)]</field> - </record> -</data> -</openerp> - diff --git a/addons/note/security/res.groups.csv b/addons/note/security/res.groups.csv new file mode 100644 index 00000000000..61c54c964ff --- /dev/null +++ b/addons/note/security/res.groups.csv @@ -0,0 +1,3 @@ +id,name,implied_ids/id
+group_note_tags,Memo / Display tags,
+group_note_fancy,Memo / Fancy mode,
|