From ff371bd37628ab6f66cf4add79bb67c276e49035 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 12:50:55 -0600 Subject: Convert packager link to search by packager Signed-off-by: Dan McGee --- packages/templatetags/package_extras.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py index 67c7fbbc..3eb7578d 100644 --- a/packages/templatetags/package_extras.py +++ b/packages/templatetags/package_extras.py @@ -61,7 +61,7 @@ def multi_pkg_details(pkgs): return ', '.join([pkg_details_link(pkg) for pkg in pkgs]) @register.simple_tag -def userpkgs(user): +def maintainer_link(user): if user: # TODO don't hardcode title = escape('View packages maintained by ' + user.get_full_name()) @@ -72,6 +72,19 @@ def userpkgs(user): ) return '' +@register.simple_tag +def packager_link(user): + if user: + # TODO don't hardcode + title = escape('View packages packaged by ' + user.get_full_name()) + return '%s' % ( + user.username, + title, + user.get_full_name(), + ) + return '' + + @register.simple_tag def scm_link(package, operation): parts = (package.repo.svn_root, operation, package.pkgbase) -- cgit v1.2.3-2-g168b From 546012c8e0d9e757e4670dd14e41acb83eb4e997 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 13:27:12 -0600 Subject: Show files and directory count in standalone package files view Signed-off-by: Dan McGee --- packages/views/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packages') diff --git a/packages/views/__init__.py b/packages/views/__init__.py index e3264161..b420ce60 100644 --- a/packages/views/__init__.py +++ b/packages/views/__init__.py @@ -169,9 +169,13 @@ 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(): -- cgit v1.2.3-2-g168b From ae00d10ff48a604e9cc9dd327046661e52ff2749 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 13:29:06 -0600 Subject: Rename files list template for consistency We use underscores in all other templates. Also remove some of the generated whitespace in the template which is noticeable in very large package lists. Signed-off-by: Dan McGee --- packages/views/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/views/__init__.py b/packages/views/__init__.py index b420ce60..13ad0c71 100644 --- a/packages/views/__init__.py +++ b/packages/views/__init__.py @@ -179,7 +179,7 @@ def files(request, name, repo, arch): } 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): -- cgit v1.2.3-2-g168b