From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 10 Jan 2018 16:29:13 +0000 (+0000)
Subject: Drop format_email function which cannot handle User instances
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1de7b85e05b9fcbf37af65fe74dfc6de48945e0e;p=pbs.git

Drop format_email function which cannot handle User instances

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/misc.py b/src/buildservice/misc.py
index 8629dd36..3f780564 100644
--- a/src/buildservice/misc.py
+++ b/src/buildservice/misc.py
@@ -49,21 +49,6 @@ def friendly_time(t):
 
 	return " ".join(ret)
 
-def format_email(email):
-	m = re.match(r"(.*) <(.*)>", email)
-	if m:
-		fmt = {
-			"name" : xhtml_escape(m.group(1)),
-			"mail" : xhtml_escape(m.group(2)),
-		}
-	else:
-		fmt = {
-			"name" : xhtml_escape(email),
-			"mail" : xhtml_escape(email),
-		}
-
-	return """<a class="email" href="mailto:%(mail)s">%(name)s</a>""" % fmt
-
 def format_filemode(filetype, filemode):
 	if filetype == 2:
 		prefix = "l"
diff --git a/src/templates/modules/bugs-table.html b/src/templates/modules/bugs-table.html
index 8094e522..9d064f71 100644
--- a/src/templates/modules/bugs-table.html
+++ b/src/templates/modules/bugs-table.html
@@ -8,7 +8,7 @@
 		<dd class="muted">
 			{{ bug.status }} {% if bug.resolution %}{{ bug.resolution }}{% end %}
 			{% if bug.assignee %}
-				&dash; {% raw format_email(bug.assignee) %}
+				&dash; {% module LinkToUser(bug.assignee) %}
 			{% end %}
 		</dd>
 	{% end %}
diff --git a/src/templates/modules/commits-table.html b/src/templates/modules/commits-table.html
index 38f1915b..99c7bc1f 100644
--- a/src/templates/modules/commits-table.html
+++ b/src/templates/modules/commits-table.html
@@ -25,7 +25,7 @@
 					{{ format_date(commit.date, full_format=True) }}
 				</td>
 				<td>
-					{% raw format_email(commit.author) %}
+					{% module LinkToUser(commit.author) %}
 				</td>
 				<td>
 					{{ commit.subject }}
diff --git a/src/web/base.py b/src/web/base.py
index 8a4b46e2..77541961 100644
--- a/src/web/base.py
+++ b/src/web/base.py
@@ -79,7 +79,6 @@ class BaseHandler(tornado.web.RequestHandler):
 			"format_date"     : self.format_date,
 			"format_size"     : misc.format_size,
 			"friendly_time"   : misc.friendly_time,
-			"format_email"    : misc.format_email,
 			"format_filemode" : misc.format_filemode,
 			"lang"            : self.locale.code[:2],
 			"session"         : self.session,
@@ -107,4 +106,4 @@ class BaseHandler(tornado.web.RequestHandler):
 			tb = None
 
 		self.render(error_document, status_code=status_code,
-			status_message=status_message, exc_info=exc_info, tb=tb, **kwargs)
\ No newline at end of file
+			status_message=status_message, exc_info=exc_info, tb=tb, **kwargs)