From 6a91c0d55819cb1032186f8a019ca42d6f9643e5 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 19 Jan 2006 03:22:09 +0000 Subject: [PATCH] magic-removal: Fixed URL-calculating logic in adminapplist template library git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2065 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/templatetags/adminapplist.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/django/contrib/admin/templatetags/adminapplist.py b/django/contrib/admin/templatetags/adminapplist.py index 7a3213c11a..ff06b42e0c 100644 --- a/django/contrib/admin/templatetags/adminapplist.py +++ b/django/contrib/admin/templatetags/adminapplist.py @@ -13,12 +13,11 @@ class AdminApplistNode(template.Node): user = context['user'] for app in models.get_installed_model_modules(): - app_label = app.__name__.split('.')[:-1][-1] + app_label = app.__name__.split('.')[-2] # TODO: Abstract this logic has_module_perms = user.has_module_perms(app_label) + if has_module_perms: model_list = [] - #HACK - app_url = "/".join( [comp for comp in app.__name__.split('.') if comp != 'models' ]) for m in app._MODELS: if m._meta.admin: perms = { @@ -32,7 +31,7 @@ class AdminApplistNode(template.Node): if True in perms.values(): model_list.append({ 'name': capfirst(m._meta.verbose_name_plural), - 'admin_url': '%s/%s/' % (app_url, m.__name__.lower()), + 'admin_url': '%s/%s/' % (app_label, m.__name__.lower()), 'perms': perms, })