innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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
This commit is contained in:
Malcolm Tredinnick 2008-06-30 12:52:46 +00:00
parent 415bd694f9
commit 339df5ce44
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/auth/models.py
View File

@ -96,10 +96,10 @@ class Group(models.Model):
class Meta: class Meta:
verbose_name = _('group') verbose_name = _('group')
verbose_name_plural = _('groups') verbose_name_plural = _('groups')
ordering = ('name',)
class Admin: class Admin:
search_fields = ('name',) search_fields = ('name',)
ordering = ('name',)
def __unicode__(self): def __unicode__(self):
return self.name return self.name
@ -153,7 +153,6 @@ class User(models.Model):
class Meta: class Meta:
verbose_name = _('user') verbose_name = _('user')
verbose_name_plural = _('users') verbose_name_plural = _('users')
ordering = ('username',)
class Admin: class Admin:
fields = ( fields = (
@ -166,6 +165,7 @@ class User(models.Model):
list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff') list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
list_filter = ('is_staff', 'is_superuser') list_filter = ('is_staff', 'is_superuser')
search_fields = ('username', 'first_name', 'last_name', 'email') search_fields = ('username', 'first_name', 'last_name', 'email')
ordering = ('username',)
def __unicode__(self): def __unicode__(self):
return self.username return self.username