mirror of
https://github.com/django/django.git
synced 2025-07-05 02:09:13 +00:00
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
This commit is contained in:
parent
bbc62cdccc
commit
4ddf1b3dc7
@ -156,7 +156,7 @@ class User(models.Model):
|
|||||||
def get_all_permissions(self):
|
def get_all_permissions(self):
|
||||||
if not hasattr(self, '_perm_cache'):
|
if not hasattr(self, '_perm_cache'):
|
||||||
import sets
|
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())
|
self._perm_cache.update(self.get_group_permissions())
|
||||||
return self._perm_cache
|
return self._perm_cache
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user