Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #6089 -- Removed default ordering on the User class.

Admin users are still ordered, since we add it in specially for Admin. Slightly
backwards incompatible.

Patch from Erik Karulf.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 339df5ce446afb1bac8356453a890f89d0220fd6 1 parent 415bd69
@malcolmt malcolmt authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/contrib/auth/models.py
View
4 django/contrib/auth/models.py
@@ -96,10 +96,10 @@ class Group(models.Model):
class Meta:
verbose_name = _('group')
verbose_name_plural = _('groups')
- ordering = ('name',)
class Admin:
search_fields = ('name',)
+ ordering = ('name',)
def __unicode__(self):
return self.name
@@ -153,7 +153,6 @@ class User(models.Model):
class Meta:
verbose_name = _('user')
verbose_name_plural = _('users')
- ordering = ('username',)
class Admin:
fields = (
@@ -166,6 +165,7 @@ class Admin:
list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
list_filter = ('is_staff', 'is_superuser')
search_fields = ('username', 'first_name', 'last_name', 'email')
+ ordering = ('username',)
def __unicode__(self):
return self.username
Please sign in to comment.
Something went wrong with that request. Please try again.