diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-28 21:05:13 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-28 21:05:13 -0500 |
commit | 9e90f1968802d350157bcbeef0cebd7d96eb1ada (patch) | |
tree | 1153f677b807c9d7f40ef2ce4f9ab692ac6979a0 /packages/views | |
parent | 60f9b3fe60d5e5b6049ef71d1dfb25dade4fd6a3 (diff) | |
parent | 20e9a83e05e352ec6e6f8fbe70457951cf9cd047 (diff) |
Merge commit '20e9a83' from Archweb
Conflicts:
main/fixtures/groups.json
packages/templatetags/package_extras.py
Diffstat (limited to 'packages/views')
-rw-r--r-- | packages/views/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/views/__init__.py b/packages/views/__init__.py index bbfe7c9f..7a8dabd5 100644 --- a/packages/views/__init__.py +++ b/packages/views/__init__.py @@ -169,13 +169,17 @@ 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') + dir_count = sum(1 for f in fileslist if f.is_directory) + files_count = len(fileslist) - dir_count context = { 'pkg': pkg, 'files': fileslist, + 'files_count': files_count, + 'dir_count': dir_count, } template = 'packages/files.html' if request.is_ajax(): - template = 'packages/files-list.html' + template = 'packages/files_list.html' return direct_to_template(request, template, context) def details_json(request, name, repo, arch): |