# HG changeset patch # User Sylvain Thénault # Date 1245911185 -7200 # Node ID e3aeb6e6c3bb5c18e8dcf61bae9d654beda6c036 # Parent f12373e049615dadc6a3619565e5e93bfd20b856 fix email address'mailto view diff -r f12373e04961 -r e3aeb6e6c3bb web/views/emailaddress.py --- a/web/views/emailaddress.py Thu Jun 25 07:58:45 2009 +0200 +++ b/web/views/emailaddress.py Thu Jun 25 08:26:25 2009 +0200 @@ -99,18 +99,17 @@ if entity.reverse_primary_email: self.w(u'') if entity.alias: - mailto = u'%s <%s>' % (entity.alias, entity.display_address()) + alias = entity.alias elif entity.reverse_use_email: - mailto = "mailto:%s <%s>" % \ - (entity.reverse_use_email[0].dc_title(), - entity.display_address()) + alias = entity.reverse_use_email[0].dc_title() + else: + alias = None + if alias: + mailto = "mailto:%s <%s>" % (alias, entity.display_address()) else: mailto = "mailto:%s" % entity.display_address() self.w(u'%s' % (html_escape(mailto), html_escape(entity.display_address()))) - - if entity.alias: - self.w(u'>\n') if entity.reverse_primary_email: self.w(u'')