diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2006-06-20 03:08:48 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2006-06-20 03:08:48 +0000 |
| commit | 551a0272e62133606d34952c309290c3e48c8a61 (patch) | |
| tree | 9ad0c2bb325ca4b111ec199025bae47f624fde74 | |
| parent | 496d65154626e674d4a3a5aea167a44b764ab0d2 (diff) | |
Fixed #2189 -- Optimized auth.User.get_all_permissions() to use select_related behind the scenes to avoid multiple queries. Thanks, konrad@gwu.edu
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | django/contrib/auth/models.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -74,6 +74,7 @@ answer newbie questions, and generally made Django that much better: Cameron Knight (ckknight) Bruce Kroeze <http://coderseye.com/> Joseph Kocherhans + konrad@gwu.edu lakin.wecker@gmail.com Stuart Langridge <http://www.kryogenix.org/> Eugene Lazutkin <http://lazutkin.com/blog/> diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py index 44d7d9ffe8..cfbdca4160 100644 --- a/django/contrib/auth/models.py +++ b/django/contrib/auth/models.py @@ -160,7 +160,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.app_label, 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.select_related()]) self._perm_cache.update(self.get_group_permissions()) return self._perm_cache |