From 68872e11751222d9dcf10f2fabc2f9ca3ae1f6d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 24 Dec 2012 13:32:15 +0100 Subject: [PATCH] [IMP] mail.group decription: take into account void descriptions. bzr revid: tde@openerp.com-20121224123215-ll9ejzuqrpik3ks5 --- addons/mail/mail_group.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py index 37c05a1a2ea..53568a16036 100644 --- a/addons/mail/mail_group.py +++ b/addons/mail/mail_group.py @@ -97,10 +97,14 @@ class mail_group(osv.Model): } def _generate_header_description(self, cr, uid, description, group, context=None): + header = '' + if description: + header = '%s' % description if group.alias_id and group.alias_id.alias_name and group.alias_id.alias_domain: - return '%s
Group email gateway: %s@%s' % (description, group.alias_id.alias_name, group.alias_id.alias_domain) - else: - return '%s' % description + if header: + header = '%s
' % header + return '%sGroup email gateway: %s@%s' % (header, group.alias_id.alias_name, group.alias_id.alias_domain) + return header def _subscribe_users(self, cr, uid, ids, context=None): for mail_group in self.browse(cr, uid, ids, context=context):