Commit 339df5ce authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
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
parent 415bd694

django/contrib/auth/models.py

+2 −2
Original line number Diff line number Diff line
@@ -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 User(models.Model): 
        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