From e557545ca803fa215b3a7f43f4c421dff1259fe3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 27 Nov 2013 16:00:49 -0500 Subject: Use pkg_details_link tag on differences report page Signed-off-by: Dan McGee --- templates/packages/differences.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'templates/packages/differences.html') diff --git a/templates/packages/differences.html b/templates/packages/differences.html index f137126d..f4d93151 100644 --- a/templates/packages/differences.html +++ b/templates/packages/differences.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% load cycle from future %} {% load static from staticfiles %} +{% load package_extras %} {% block title %}Arch Linux - Package Differences Reports{% endblock %} {% block navbarclass %}anb-packages{% endblock %} @@ -78,12 +79,10 @@

Multilib Differences to Main Packages

{% for pkg1, pkg2 in multilib_differences %} - {{ pkg1.pkgname }} + {% pkg_details_link pkg1 %} {{ pkg1.full_version }} {{ pkg2.full_version }} - {{ pkg2.pkgname }} + {% pkg_details_link pkg2 %} {{ pkg2.repo }} {{ pkg1.last_update|date }} {{ pkg2.last_update|date }} -- cgit v1.2.3-54-g00ecf From 58356ec5b38c71204895eb77856a45ffd7ac1725 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 27 Nov 2013 16:07:49 -0500 Subject: Allow pkg_details_link to honor package flag state This allows the tag to be used in a few more places we weren't already able to use it, and hopefully speeds up rendering a tad on the package differences page. Signed-off-by: Dan McGee --- packages/templatetags/package_extras.py | 7 +++++-- templates/packages/differences.html | 8 ++------ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'templates/packages/differences.html') diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py index f7392a96..3ce64748 100644 --- a/packages/templatetags/package_extras.py +++ b/packages/templatetags/package_extras.py @@ -67,13 +67,16 @@ def do_buildsortqs(parser, token): @register.simple_tag -def pkg_details_link(pkg, link_title=None): +def pkg_details_link(pkg, link_title=None, honor_flagged=False): if not pkg: return link_title or '' if link_title is None: link_title = pkg.pkgname + link_content = link_title + if honor_flagged and pkg.flag_date: + link_content = '%s' % link_title link = '%s' - return link % (pkg.get_absolute_url(), pkg.pkgname, link_title) + return link % (pkg.get_absolute_url(), pkg.pkgname, link_content) @register.simple_tag diff --git a/templates/packages/differences.html b/templates/packages/differences.html index f4d93151..5ebe18e2 100644 --- a/templates/packages/differences.html +++ b/templates/packages/differences.html @@ -46,14 +46,10 @@

Filter Differences View

{{ diff.pkgname }} {{ diff.repo.name }} {% if diff.pkg_a %} - - {{ diff.pkg_a.full_version }} + {% pkg_details_link diff.pkg_a diff.pkg_a.full_version True %} {% else %}-{% endif %} {% if diff.pkg_b %} - - {{ diff.pkg_b.full_version }} + {% pkg_details_link diff.pkg_b diff.pkg_b.full_version True %} {% else %}-{% endif %} {% endfor %} -- cgit v1.2.3-54-g00ecf