diff options
| author | Thibault Delavallée <tde@openerp.com> | 2015-05-29 12:04:56 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2015-07-09 11:13:02 +0200 |
| commit | d931aa38256518cbdfe576ca7992aa46ccceb49e (patch) | |
| tree | 9244c6f5f406407eb6777326f21443a9eb0a791b /addons/portal | |
| parent | 2c36354ca9c3939cc222e4fdad4adba6d3c0e315 (diff) | |
[RENAME] mail, portal: updated actions and views xml ids
for channel-related stuff. mail.channel views as well as timeline views
and actions have been renamed. Now the names follow the guidelines and
will be used in the upcoming refactoring of mail and chat.
Diffstat (limited to 'addons/portal')
| -rw-r--r-- | addons/portal/mail_thread.py | 2 | ||||
| -rw-r--r-- | addons/portal/portal_view.xml | 4 | ||||
| -rw-r--r-- | addons/portal/tests/test_portal.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/addons/portal/mail_thread.py b/addons/portal/mail_thread.py index 39c6ec7339d..ad3a8e6a043 100644 --- a/addons/portal/mail_thread.py +++ b/addons/portal/mail_thread.py @@ -20,6 +20,6 @@ class mail_thread(osv.AbstractModel): cur_user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context) # if uid is a portal user -> action is different if any(group.is_portal for group in cur_user.groups_id): - return 'portal.action_mail_inbox_feeds_portal' + return 'portal.mail_message_action_inbox_portal' else: return super(mail_thread, self)._get_inbox_action_xml_id(cr, uid, context=context) diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml index 2cc0d0e4da1..8b45ed6ae89 100644 --- a/addons/portal/portal_view.xml +++ b/addons/portal/portal_view.xml @@ -11,7 +11,7 @@ <menuitem name="Messaging" id="portal_messages" parent="portal_menu" sequence="10" groups="base.group_portal"/> - <record model="ir.actions.act_window" id="action_mail_inbox_feeds_portal"> + <record model="ir.actions.act_window" id="mail_message_action_inbox_portal"> <field name="name">Inbox</field> <field name="res_model">mail.message</field> <field name="view_type">form</field> @@ -33,7 +33,7 @@ </record> <menuitem name="Inbox" id="portal_inbox" parent="portal_messages" - action="action_mail_inbox_feeds_portal" sequence="10" groups="base.group_portal"/> + action="mail_message_action_inbox_portal" sequence="10" groups="base.group_portal"/> <!-- Create menu items that we'll leave empty for now - they'll be diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py index 46223c9096d..5745ab80ec6 100644 --- a/addons/portal/tests/test_portal.py +++ b/addons/portal/tests/test_portal.py @@ -86,7 +86,7 @@ class test_portal(TestMail): @mute_logger('openerp.addons.mail.models.mail_mail', 'openerp.models') def test_inbox_redirection_portal(self): group_pigs = self.group_pigs - port_act_id = self.ref('portal.action_mail_inbox_feeds_portal') + port_act_id = self.ref('portal.mail_message_action_inbox_portal') # Data: post a message on pigs msg = group_pigs.message_post(body='My body', partner_ids=[self.user_employee.partner_id.id, self.user_portal.partner_id.id], type='comment', subtype='mail.mt_comment') # Chell has no read access to pigs -> should redirect to Portal Inbox |