diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2012-08-14 13:29:42 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2012-08-14 13:29:42 +0200 |
| commit | ff9cbe0673eec425e5cd9caadbb0182a051b70bf (patch) | |
| tree | d093984ce7cef63ca3f32374e0aa18a6210e0eec /addons/mail/security/mail_security.xml | |
| parent | 149c6f793f4f184dbf5265a7b70c4cf78ee43568 (diff) | |
| parent | 85ca542ad09a8a9890db63e421a7509b681d36d6 (diff) | |
[MERGE] mail groups improvements
better form view
security on groups: public, private, selected groups (for employees)
menu automatically created/filtered
action to open a specific group inline
small fix in composition: new msg not linked to current user
bzr revid: fp@openerp.com-20120814112942-8wo9owa14hk5xqbj
Diffstat (limited to 'addons/mail/security/mail_security.xml')
| -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> |