diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2012-08-14 18:10:04 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2012-08-14 18:10:04 +0530 |
| commit | d2f66681bc4bcafcd2b95e090ebb6ff287a69d89 (patch) | |
| tree | d8c66c00f8d7c9e7e4f2a1b46b4956168828ad39 /addons/mail/security | |
| parent | 94b94e6a58c2307ca97c58b479c37a7484dad1ef (diff) | |
| parent | 2376fe0add0409f5ff17218658d939de0e61ecff (diff) | |
[MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120814124004-2sze9pxw03jf0epw
Diffstat (limited to 'addons/mail/security')
| -rw-r--r-- | addons/mail/security/mail_security.xml | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml index 34fcbac3088..e73279b1ad7 100644 --- a/addons/mail/security/mail_security.xml +++ b/addons/mail/security/mail_security.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> - <data noupdate="1"> + <data> <!-- CATEGORY --> <record model="ir.module.category" id="module_category_social"> @@ -20,23 +20,8 @@ <record id="group_rule_public_and_joined" model="ir.rule"> <field name="name">Mail.group: access only public and joined groups</field> <field name="model_id" ref="model_mail_group"/> - <field name="domain_force">['|', ('public', '=', True), ('member_ids', 'in', user.id)]</field> - <field name="perm_create" eval="False"/> - <field name="perm_unlink" eval="False"/> - </record> - <record id="group_rule_delete_mygroup" model="ir.rule"> - <field name="name">Mail.group: delete my groups only</field> - <field name="model_id" ref="model_mail_group"/> - <field name="domain_force">[('responsible_id', '=', user.id)]</field> - <field name="perm_read" eval="False"/> - <field name="perm_write" eval="False"/> - <field name="perm_create" eval="False"/> - </record> - <record id="group_rule_all" model="ir.rule"> - <field name="name">Mail.group: all groups</field> - <field name="model_id" ref="model_mail_group"/> - <field name="domain_force">[(1,'=',1)]</field> - <field name="groups" eval="[(4, ref('group_mail_manager'))]"/> + <!-- This rule has to be improved for employee only groups --> + <field name="domain_force">['|', '|', ('public', '=', 'public'), ('member_ids', 'in', [user.id]), '&', ('public','=','groups'), ('group_public_id','in', [x.id for x in user.groups_id])]</field> </record> </data> |