diff options
author | Dan McGee <dan@archlinux.org> | 2013-11-27 22:07:49 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2013-11-27 22:07:49 +0100 |
commit | 58356ec5b38c71204895eb77856a45ffd7ac1725 (patch) | |
tree | 4b4700dc2d281fc61c1713b16204603334f442f2 | |
parent | e557545ca803fa215b3a7f43f4c421dff1259fe3 (diff) | |
download | archweb-58356ec5b38c71204895eb77856a45ffd7ac1725.tar.gz archweb-58356ec5b38c71204895eb77856a45ffd7ac1725.tar.xz |
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 <dan@archlinux.org>
-rw-r--r-- | packages/templatetags/package_extras.py | 7 | ||||
-rw-r--r-- | templates/packages/differences.html | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py index f7392a9..3ce6474 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 = '<span class="flagged">%s</span>' % link_title link = '<a href="%s" title="View package details for %s">%s</a>' - 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 f4d9315..5ebe18e 100644 --- a/templates/packages/differences.html +++ b/templates/packages/differences.html @@ -46,14 +46,10 @@ <td>{{ diff.pkgname }}</td> <td>{{ diff.repo.name }}</td> {% if diff.pkg_a %} - <td><a href="{{ diff.pkg_a.get_absolute_url }}" - title="View package details for {{ diff.pkg_a.pkgname }}"> - <span{% if diff.pkg_a.flag_date %} class="flagged"{% endif %}>{{ diff.pkg_a.full_version }}</span></a></td> + <td>{% pkg_details_link diff.pkg_a diff.pkg_a.full_version True %}</td> {% else %}<td>-</td>{% endif %} {% if diff.pkg_b %} - <td><a href="{{ diff.pkg_b.get_absolute_url }}" - title="View package details for {{ diff.pkg_b.pkgname }}"> - <span{% if diff.pkg_b.flag_date %} class="flagged"{% endif %}>{{ diff.pkg_b.full_version }}</span></a></td> + <td>{% pkg_details_link diff.pkg_b diff.pkg_b.full_version True %}</td> {% else %}<td>-</td>{% endif %} </tr> {% endfor %} |