summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-20 08:09:20 +0200
committerDan McGee <dan@archlinux.org>2011-06-20 08:09:20 +0200
commit92e13e0670661a542db646c668780cb4620c0b13 (patch)
tree8025c6587ee03241bcf4517c1e9ca00d2de1a52b
parent00eb8f426a8ddb905fcf8b241eb29b687b9db8ed (diff)
downloadarchweb-92e13e0670661a542db646c668780cb4620c0b13.tar.gz
archweb-92e13e0670661a542db646c668780cb4620c0b13.tar.xz
Differentiate between no filelist and empty filelist
We had these two cases munged together before; some packages have seen filelist updates but simply don't have any files ('firefox-i18n' for example). Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--packages/views.py7
-rw-r--r--templates/packages/files-list.html6
2 files changed, 10 insertions, 3 deletions
diff --git a/packages/views.py b/packages/views.py
index 486fb94..7b8c2e6 100644
--- a/packages/views.py
+++ b/packages/views.py
@@ -290,11 +290,14 @@ def files(request, name, repo, arch):
pkg = get_object_or_404(Package,
pkgname=name, repo__name__iexact=repo, arch__name=arch)
fileslist = PackageFile.objects.filter(pkg=pkg).order_by('directory', 'filename')
+ context = {
+ 'pkg': pkg,
+ 'files': fileslist,
+ }
template = 'packages/files.html'
if request.is_ajax():
template = 'packages/files-list.html'
- return direct_to_template(request, template,
- {'pkg':pkg, 'files':fileslist})
+ return direct_to_template(request, template, context)
def details_json(request, name, repo, arch):
pkg = get_object_or_404(Package,
diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html
index bb89b66..95a85d2 100644
--- a/templates/packages/files-list.html
+++ b/templates/packages/files-list.html
@@ -2,12 +2,16 @@
<p class="message">Note: This file list was generated from a previous version
of the package; it may be out of date.</p>
{% endif %}
-{% if files.count %}
+{% if pkg.files_last_update %}
+{% if files|length %}
<ul>
{% for file in files %}
<li>{{ file.directory }}{{ file.filename|default:'' }}</li>
{% endfor %}
</ul>
{% else %}
+<p class="message">Package has no files.</p>
+{% endif %}
+{% else %}
<p class="message">No file list available.</p>
{% endif %}