From 4ddf1b3dc7d90278198d6fdc4305846d63e9df7c Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Mon, 13 Mar 2006 21:24:25 +0000 Subject: [PATCH] magic-removal: Fixed User.get_all_permissions() and related methods (including User.has_perm()) git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2520 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/auth/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py index 64787e2d62..fe26ff94d7 100644 --- a/django/contrib/auth/models.py +++ b/django/contrib/auth/models.py @@ -156,7 +156,7 @@ class User(models.Model): def get_all_permissions(self): if not hasattr(self, '_perm_cache'): import sets - self._perm_cache = sets.Set(["%s.%s" % (p.content_type, p.codename) for p in self.user_permissions.all()]) + self._perm_cache = sets.Set(["%s.%s" % (p.content_type.app_label, p.codename) for p in self.user_permissions.all()]) self._perm_cache.update(self.get_group_permissions()) return self._perm_cache