mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-03 06:55:47 +00:00
Code Issues 30 Releases Wiki Activity

Fixed #25895 -- Used a consistent style for UserAdmin overrides.

Browse Source 
Thanks Justin Abrahms for the report.
This commit is contained in:
Tim Graham 2015-12-08 14:40:55 -05:00
parent 26c26e8308
commit 166e0490d3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/releases/1.10.txt
View File

@ -323,14 +323,14 @@ when creating a user or changing usernames::
If you wish to keep this restriction in the admin, set ``UserAdmin.add_form`` If you wish to keep this restriction in the admin, set ``UserAdmin.add_form``
to use this form:: to use this form::
from django.contrib.auth.admin import UserAdmin from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.models import User from django.contrib.auth.models import User
class MyUserAdmin(UserAdmin): class UserAdmin(BaseUserAdmin):
add_form = MyUserCreationForm add_form = MyUserCreationForm
admin.site.unregister(User) admin.site.unregister(User)
admin.site.register(User, MyUserAdmin) admin.site.register(User, UserAdmin)
Miscellaneous Miscellaneous
~~~~~~~~~~~~~ ~~~~~~~~~~~~~

10
docs/topics/auth/customizing.txt
View File

@ -326,7 +326,7 @@ add it to a ``UserAdmin`` class which is registered with the
:class:`~django.contrib.auth.models.User` class:: :class:`~django.contrib.auth.models.User` class::
from django.contrib import admin from django.contrib import admin
from django.contrib.auth.admin import UserAdmin from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.models import User from django.contrib.auth.models import User
from my_user_profile_app.models import Employee from my_user_profile_app.models import Employee
@ -339,7 +339,7 @@ add it to a ``UserAdmin`` class which is registered with the
verbose_name_plural = 'employee' verbose_name_plural = 'employee'
# Define a new User admin # Define a new User admin
class UserAdmin(UserAdmin): class UserAdmin(BaseUserAdmin):
inlines = (EmployeeInline, ) inlines = (EmployeeInline, )
# Re-register UserAdmin # Re-register UserAdmin
@ -1059,7 +1059,7 @@ code would be required in the app's ``admin.py`` file::
from django import forms from django import forms
from django.contrib import admin from django.contrib import admin
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
from django.contrib.auth.admin import UserAdmin from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.forms import ReadOnlyPasswordHashField from django.contrib.auth.forms import ReadOnlyPasswordHashField
from customauth.models import MyUser from customauth.models import MyUser
@ -1110,7 +1110,7 @@ code would be required in the app's ``admin.py`` file::
return self.initial["password"] return self.initial["password"]
class MyUserAdmin(UserAdmin): class UserAdmin(BaseUserAdmin):
# The forms to add and change user instances # The forms to add and change user instances
form = UserChangeForm form = UserChangeForm
add_form = UserCreationForm add_form = UserCreationForm
@ -1138,7 +1138,7 @@ code would be required in the app's ``admin.py`` file::
filter_horizontal = () filter_horizontal = ()
# Now register the new UserAdmin... # Now register the new UserAdmin...
admin.site.register(MyUser, MyUserAdmin) admin.site.register(MyUser, UserAdmin)
# ... and, since we're not using Django's built-in permissions, # ... and, since we're not using Django's built-in permissions,
# unregister the Group model from admin. # unregister the Group model from admin.
admin.site.unregister(Group) admin.site.unregister(Group)