summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-01-12 23:35:54 +0000
committerJannis Leidel <jannis@leidel.info>2010-01-12 23:35:54 +0000
commitf4998574d3edd045ef28323b2d496eff58098f90 (patch)
tree6931960ff46702f39b41e6fbbe73bfd42f9643a9
parentc4470e5ced090075adbef36b98b051c5a53f7a2e (diff)
Fixed #11796 - Tweaked ordering of permissions a little more to be even nicer.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12219 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 ceab7baf12..3328fe4e96 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -72,7 +72,7 @@ class Permission(models.Model):
verbose_name = _('permission')
verbose_name_plural = _('permissions')
unique_together = (('content_type', 'codename'),)
- ordering = ('content_type__app_label', 'codename')
+ ordering = ('content_type__app_label', 'content_type__model', 'codename')
def __unicode__(self):
return u"%s | %s | %s" % (