[FIX] mail: bad display of aliases on user forms

(Partial backport of commit 1f8615699105e75ccbe9dc36c8ff9266868bbfb0)

Closes #800.

diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 1eacb90..ad680bd 100644 (file)
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -27,6 +27,7 @@ from openerp.osv import fields, osv
 from openerp.tools import ustr
 from openerp.modules.registry import RegistryManager
 from openerp import SUPERUSER_ID
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
@@ -129,16 +130,18 @@ class mail_alias(osv.Model):
     ]
 
     def name_get(self, cr, uid, ids, context=None):
-        """Return the mail alias display alias_name, inclusing the implicit
-           mail catchall domain from config.
-           e.g. `jobs@openerp.my.openerp.com` or `sales@openerp.my.openerp.com`
+        """Return the mail alias display alias_name, including the implicit
+           mail catchall domain if exists from config otherwise "New Alias".
+           e.g. `jobs@openerp.my.openerp.com` or `jobs` or 'New Alias'
         """
         res = []
         for record in self.browse(cr, uid, ids, context=context):
             if record.alias_name and record.alias_domain:
                 res.append((record['id'], "%s@%s" % (record.alias_name, record.alias_domain)))
+            elif record.alias_name:
+                res.append((record['id'], "%s" % (record.alias_name)))
             else:
-                res.append((record['id'], False))
+                res.append((record['id'], _("Inactive Alias")))
         return res
 
     def _find_unique(self, cr, uid, name, context=None):