Merge commit '20e9a83' from Archweb

Conflicts:
	main/fixtures/groups.json
	packages/templatetags/package_extras.py

1 files changed, 13 insertions, 1 deletions

diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index a2f2387e..a8a8bd0f 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -61,7 +61,7 @@ def multi_pkg_details(pkgs):
     return ', '.join([pkg_details_link(pkg) for pkg in pkgs])
 
 @register.simple_tag
-def userpkgs(user):
+def maintainer_link(user):
     if user:
         # TODO don't hardcode
         title = escape('View packages maintained by ' + user.get_full_name())
@@ -85,6 +85,18 @@ def get_download_link(package):
     return linkbase % parts
 
 @register.simple_tag
+def packager_link(user):
+    if user:
+        # TODO don't hardcode
+        title = escape('View packages packaged by ' + user.get_full_name())
+        return '<a href="/packages/?packager=%s" title="%s">%s</a>' % (
+                user.username,
+                title,
+                user.get_full_name(),
+        )
+    return ''
+
+@register.simple_tag
 def get_wiki_link(package):
     url = "//wiki.parabolagnulinux.org/index.php"
     data = {