diff options
| author | Dan McGee <dan@archlinux.org> | 2012-05-18 19:57:40 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-05-18 21:36:05 -0500 |
| commit | 1625cd31c334b017688a8c30631ddad60fafd8f4 (patch) | |
| tree | f9d5dcd6b5736a04e9ed1072b3fbb931d395a4f4 | |
| parent | 158be107e4ad682de0c9360658dfa5a72c21ee58 (diff) | |
Link to provides/conflicts/replacements if we can in details template
Use the newly implemented get_best_satisfier() method that is in the
abstract base class for all of these types.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | templates/packages/details.html | 12 | ||||
| -rw-r--r-- | templates/packages/details_relatedto.html | 10 |
2 files changed, 16 insertions, 6 deletions
diff --git a/templates/packages/details.html b/templates/packages/details.html index 4cb6032e..358ab525 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -120,22 +120,22 @@ </td> </tr> {% endif %}{% endwith %} - {% with pkg.provides.all as provides %}{% if provides %} + {% with pkg.provides.all as all_related %}{% if all_related %} <tr> <th>Provides:</th> - <td class="wrap">{{ provides|join:", " }}</td> + <td class="wrap">{% include "packages/details_relatedto.html" %}</td> </tr> {% endif %}{% endwith %} - {% with pkg.conflicts.all as conflicts %}{% if conflicts %} + {% with pkg.conflicts.all as all_related %}{% if all_related %} <tr> <th>Conflicts:</th> - <td class="wrap">{{ conflicts|join:", " }}</td> + <td class="wrap">{% include "packages/details_relatedto.html" %}</td> </tr> {% endif %}{% endwith %} - {% with pkg.replaces.all as replaces %}{% if replaces %} + {% with pkg.replaces.all as all_related %}{% if all_related %} <tr> <th>Replaces:</th> - <td class="wrap">{{ replaces|join:", " }}</td> + <td class="wrap">{% include "packages/details_relatedto.html" %}</td> </tr> {% endif %}{% endwith %} <tr> diff --git a/templates/packages/details_relatedto.html b/templates/packages/details_relatedto.html new file mode 100644 index 00000000..1ffe2884 --- /dev/null +++ b/templates/packages/details_relatedto.html @@ -0,0 +1,10 @@ +{% load package_extras %} +{% for related in all_related %} +{% with related.get_best_satisfier as best_satisfier %} +{% ifequal best_satisfier None %} +{{ related.name }}{{ related.comparison|default:"" }}{{ related.version|default:"" }}{% if not forloop.last %}, {% endif %} +{% else %} +{% pkg_details_link best_satisfier %}{{ related.comparison|default:"" }}{{related.version|default:"" }}{% if not forloop.last %}, {% endif %} +{% endifequal %} +{% endwith %} +{% endfor %} |