summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2008-08-08 21:24:02 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2008-08-08 21:24:02 +0000
commit19bbc74e46ddac5c5f5803182600bd44d310b24f (patch)
treefb41ef8d685f4b99d4fabc67c714fdc0cb6bd524
parent660b9095577f53eab27bbfeec7c452bc0047a278 (diff)
Fixed #7115: tweaked ordering on Permission to more closely match the pre-QSRF behavior, which was nice. Thanks, Matthew Flanagan.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/auth/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index 3ea184a7f8..b2edef04cb 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -78,7 +78,7 @@ class Permission(models.Model):
verbose_name = _('permission')
verbose_name_plural = _('permissions')
unique_together = (('content_type', 'codename'),)
- ordering = ('content_type', 'codename')
+ ordering = ('content_type__app_label', 'codename')
def __unicode__(self):
return u"%s | %s | %s" % (self.content_type.app_label, self.content_type, self.name)