aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/patchwork/templatetags/person.py9
-rw-r--r--templates/patchwork/patch-list.html2
-rw-r--r--templates/patchwork/patch.html4
3 files changed, 9 insertions, 6 deletions
diff --git a/apps/patchwork/templatetags/person.py b/apps/patchwork/templatetags/person.py
index 07c356a..c337c74 100644
--- a/apps/patchwork/templatetags/person.py
+++ b/apps/patchwork/templatetags/person.py
@@ -20,20 +20,23 @@
from django import template
from django.utils.html import escape
from django.utils.safestring import mark_safe
+from django.core.urlresolvers import reverse
+from patchwork.filters import SubmitterFilter
import re
register = template.Library()
@register.filter
-def personify(person):
+def personify(person, project):
if person.name:
linktext = escape(person.name)
else:
linktext = escape(person.email)
- str = '<a href="mailto:%s">%s</a>' % \
- (escape(person.email), linktext)
+ url = reverse('patchwork.views.patch.list', kwargs = {'project_id' : project.linkname})
+ str = '<a href="%s?%s=%s">%s</a>' % \
+ (url, SubmitterFilter.param, escape(person.id), linktext)
return mark_safe(str)
diff --git a/templates/patchwork/patch-list.html b/templates/patchwork/patch-list.html
index 59adbe3..f8049f7 100644
--- a/templates/patchwork/patch-list.html
+++ b/templates/patchwork/patch-list.html
@@ -146,7 +146,7 @@
<td><a href="{% url 'patchwork.views.patch.patch' patch_id=patch.id %}"
>{{ patch.name|default:"[no subject]" }}</a></td>
<td>{{ patch.date|date:"Y-m-d" }}</td>
- <td>{{ patch.submitter|personify }}</td>
+ <td>{{ patch.submitter|personify:project }}</td>
<td>{{ patch.delegate.username }}</td>
<td>{{ patch.state }}</td>
</tr>
diff --git a/templates/patchwork/patch.html b/templates/patchwork/patch.html
index c04e32b..be831e9 100644
--- a/templates/patchwork/patch.html
+++ b/templates/patchwork/patch.html
@@ -30,7 +30,7 @@ function toggle_headers(link_id, headers_id)
<table class="patchmeta">
<tr>
<th>Submitter</th>
- <td>{{ patch.submitter|personify }}</td>
+ <td>{{ patch.submitter|personify:project }}</td>
</tr>
<tr>
<th>Date</th>
@@ -179,7 +179,7 @@ function toggle_headers(link_id, headers_id)
<h2>Comments</h2>
{% for comment in patch.comments %}
<div class="comment">
-<div class="meta">{{ comment.submitter|personify }} - {{comment.date}}</div>
+<div class="meta">{{ comment.submitter|personify:project }} - {{comment.date}}</div>
<pre class="content">
{{ comment|commentsyntax }}
</pre>