diff options
| author | Thibault Delavallée <tde@openerp.com> | 2015-05-29 10:22:20 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2015-07-09 11:12:50 +0200 |
| commit | 2c36354ca9c3939cc222e4fdad4adba6d3c0e315 (patch) | |
| tree | 715738733d34bf049299495397c357609c4a29ef /addons/mail/security | |
| parent | a316295e36f7c994facfee5b13f1704812a91244 (diff) | |
[RENAME] mail, website_mail, website_mail_group, various: mail.group
model has been renamed to mail.channel to prepare the slack modeling.
In future commits the mail.group model will be merged with the channel
model from im_chat. The first move is to rename mail.group into
mail.channel to have a model that will unite both features.
Diffstat (limited to 'addons/mail/security')
| -rw-r--r-- | addons/mail/security/ir.model.access.csv | 4 | ||||
| -rw-r--r-- | addons/mail/security/mail_security.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv index c66045d6fe8..701bbffbeca 100644 --- a/addons/mail/security/ir.model.access.csv +++ b/addons/mail/security/ir.model.access.csv @@ -14,8 +14,8 @@ access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0, access_mail_notification_portal,mail.notification.portal,model_mail_notification,base.group_portal,1,1,1,0
access_mail_notification_user,mail.notification.user,model_mail_notification,base.group_user,1,1,1,0
access_mail_notification_system,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1
-access_mail_group_all,mail.group.all,model_mail_group,,1,0,0,0
-access_mail_group_user,mail.group.user,model_mail_group,base.group_user,1,1,1,1
+access_mail_channel_all,mail.group.all,model_mail_channel,,1,0,0,0
+access_mail_channel_user,mail.group.user,model_mail_channel,base.group_user,1,1,1,1
access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,0,0
access_mail_alias_user,mail.alias.user,model_mail_alias,base.group_user,1,1,1,0
access_mail_alias_system,mail.alias.system,model_mail_alias,base.group_system,1,1,1,1
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml index 2f07c659c95..c769640b10c 100644 --- a/addons/mail/security/mail_security.xml +++ b/addons/mail/security/mail_security.xml @@ -3,9 +3,9 @@ <data noupdate="1"> <!-- RULES --> - <record id="mail_group_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"/> + <record id="mail_channel_rule" model="ir.rule"> + <field name="name">Mail.channel: access only public and joined groups</field> + <field name="model_id" ref="model_mail_channel"/> <!-- This rule has to be improved for employee only groups --> <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id]), '&', ('public','=','groups'), ('group_public_id','in', [g.id for g in user.groups_id])]</field> <field name="perm_create" eval="False"/> |