From 19bbc74e46ddac5c5f5803182600bd44d310b24f Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Fri, 8 Aug 2008 21:24:02 +0000 Subject: [PATCH] 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 --- 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 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)