[IMP] mail: empty list help: take first created alias by default, because this should...

[odoo/odoo.git] / addons / mail / mail_group.py

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 53568a1..24aed94 100644 (file)
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -96,10 +96,10 @@ class mail_group(osv.Model):
         'alias_domain': False,  # always hide alias during creation
     }
 
-    def _generate_header_description(self, cr, uid, description, group, context=None):
+    def _generate_header_description(self, cr, uid, group, context=None):
         header = ''
-        if description:
-            header = '%s' % description
+        if group.description:
+            header = '%s' % group.description
         if group.alias_id and group.alias_id.alias_name and group.alias_id.alias_domain:
             if header:
                 header = '%s<br/>' % header
@@ -148,7 +148,7 @@ class mail_group(osv.Model):
                 'context': {'default_model': 'mail.group', 'default_res_id': mail_group_id, 'search_default_message_unread': True},
                 'res_model': 'mail.message',
                 'thread_level': 1,
-                'header_description': self._generate_header_description(cr, uid, vals.get('description'), group, context=context)
+                'header_description': self._generate_header_description(cr, uid, group, context=context)
             }
             cobj = self.pool.get('ir.actions.client')
             newref = cobj.copy(cr, SUPERUSER_ID, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
@@ -175,12 +175,12 @@ class mail_group(osv.Model):
         result = super(mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('group_ids'):
             self._subscribe_users(cr, uid, ids, context=context)
-        # if description is changed: update client action
-        if vals.get('description'):
+        # if description, name or alias is changed: update client action
+        if vals.get('description') or vals.get('name') or vals.get('alias_id') or vals.get('alias_name'):
             cobj = self.pool.get('ir.actions.client')
             for action in [group.menu_id.action for group in self.browse(cr, uid, ids, context=context)]:
                 new_params = action.params
-                new_params['header_description'] = self._generate_header_description(cr, uid, vals.get('description'), group, context=context)
+                new_params['header_description'] = self._generate_header_description(cr, uid, group, context=context)
                 cobj.write(cr, SUPERUSER_ID, [action.id], {'params': str(new_params)}, context=context)
         # if name is changed: update menu
         if vals.get('name'):