From 6b893e4a1a589ae98f28ac0c0aa16a06b3a982aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 27 Mar 2013 10:58:22 +0100 Subject: [PATCH] [FIX] mail_group: fixed client action, no more Unread messages, send or log -> composition box with a correct message. bzr revid: tde@openerp.com-20130327095822-m3m2jiwpsa6y5qvi --- addons/mail/mail_group.py | 16 ++++++++++++---- addons/mail/mail_group_view.xml | 1 - 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py index 24aed942b1b..f8873ab90c5 100644 --- a/addons/mail/mail_group.py +++ b/addons/mail/mail_group.py @@ -133,7 +133,7 @@ class mail_group(osv.Model): menu_id = mobj.create(cr, SUPERUSER_ID, {'name': vals['name'], 'parent_id': menu_parent}, context=context) vals['menu_id'] = menu_id - # Create group and alias + # Create group and alias, without creation note mail_group_id = super(mail_group, self).create(cr, uid, vals, context=context) mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context) group = self.browse(cr, uid, mail_group_id, context=context) @@ -144,11 +144,19 @@ class mail_group(osv.Model): search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search') params = { 'search_view_id': search_ref and search_ref[1] or False, - 'domain': [('model', '=', 'mail.group'), ('res_id', '=', mail_group_id)], - 'context': {'default_model': 'mail.group', 'default_res_id': mail_group_id, 'search_default_message_unread': True}, + 'domain': [ + ('model', '=', 'mail.group'), + ('res_id', '=', mail_group_id), + ], + 'context': { + 'default_model': 'mail.group', + 'default_res_id': mail_group_id, + }, 'res_model': 'mail.message', 'thread_level': 1, - 'header_description': self._generate_header_description(cr, uid, group, context=context) + 'header_description': self._generate_header_description(cr, uid, group, context=context), + 'view_mailbox': True, + 'compose_placeholder': 'Send a message to the group', } cobj = self.pool.get('ir.actions.client') newref = cobj.copy(cr, SUPERUSER_ID, ref[1], default={'params': str(params), 'name': vals['name']}, context=context) diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index 77c0b8f6c86..5ccee40d5c7 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -7,7 +7,6 @@ mail.wall mail.message { - 'search_default_message_unread': True } { 'read_action': 'read'