summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-12-08 14:40:55 -0500
committerTim Graham <timograham@gmail.com>2015-12-08 14:42:39 -0500
commitcdc354eb39085bb03f90216509611c279bf368f5 (patch)
treec92955d810c0422bb7fa922f9894af3d59f7addd /docs
parent975a451153d56561a84d5c2ca692bc10bd656b77 (diff)
[1.8.x] Fixed #25895 -- Used a consistent style for UserAdmin overrides.
Thanks Justin Abrahms for the report. Backport of 166e0490d39f619928ee9c5133cc5cab0ae5c1db from master
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/auth/customizing.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
index b58093b2d6..4d9ac3a32d 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -329,7 +329,7 @@ add it to a ``UserAdmin`` class which is registered with the
:class:`~django.contrib.auth.models.User` class::
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 my_user_profile_app.models import Employee
@@ -342,7 +342,7 @@ add it to a ``UserAdmin`` class which is registered with the
verbose_name_plural = 'employee'
# Define a new User admin
- class UserAdmin(UserAdmin):
+ class UserAdmin(BaseUserAdmin):
inlines = (EmployeeInline, )
# Re-register UserAdmin
@@ -1052,7 +1052,7 @@ code would be required in the app's ``admin.py`` file::
from django import forms
from django.contrib import admin
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 customauth.models import MyUser
@@ -1103,7 +1103,7 @@ code would be required in the app's ``admin.py`` file::
return self.initial["password"]
- class MyUserAdmin(UserAdmin):
+ class UserAdmin(BaseUserAdmin):
# The forms to add and change user instances
form = UserChangeForm
add_form = UserCreationForm
@@ -1131,7 +1131,7 @@ code would be required in the app's ``admin.py`` file::
filter_horizontal = ()
# 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,
# unregister the Group model from admin.
admin.site.unregister(Group)