mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Converted django.contrib.auth model admin options to use new syntax

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-04-07 04:33:45 +00:00
parent 1df79c5115
commit 1cf0a2d792
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,10 +63,6 @@ class Group(models.Model):
verbose_name_plural = _('groups') verbose_name_plural = _('groups')
ordering = ('name',) ordering = ('name',)
class Admin:
search_fields = ('name',)
filter_horizontal = ('permissions',)
def __str__(self): def __str__(self):
return self.name return self.name
@ -111,19 +107,6 @@ class User(models.Model):
verbose_name_plural = _('users') verbose_name_plural = _('users')
ordering = ('username',) ordering = ('username',)
class Admin:
fields = (
(None, {'fields': ('username', 'password')}),
(_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),
(_('Permissions'), {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}),
(_('Important dates'), {'fields': ('last_login', 'date_joined')}),
(_('Groups'), {'fields': ('groups',)}),
)
list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
list_filter = ('is_staff', 'is_superuser')
search_fields = ('username', 'first_name', 'last_name', 'email')
filter_horizontal = ('user_permissions',)
def __str__(self): def __str__(self):
return self.username return self.username
@ -320,3 +303,29 @@ class AnonymousUser(object):
def is_authenticated(self): def is_authenticated(self):
return False return False
# Register the admin options for these models.
# TODO: Maybe this should live in a separate module admin.py, but how would we
# ensure that module was loaded?
from django.contrib import admin
class GroupAdmin(admin.ModelAdmin):
search_fields = ('name',)
filter_horizontal = ('permissions',)
class UserAdmin(admin.ModelAdmin):
fields = (
(None, {'fields': ('username', 'password')}),
(_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),
(_('Permissions'), {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}),
(_('Important dates'), {'fields': ('last_login', 'date_joined')}),
(_('Groups'), {'fields': ('groups',)}),
)
list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
list_filter = ('is_staff', 'is_superuser')
search_fields = ('username', 'first_name', 'last_name', 'email')
filter_horizontal = ('user_permissions',)
admin.site.register(Group, GroupAdmin)
admin.site.register(User, UserAdmin)