[1.8.x] Fixed #25895 -- Used a consistent style for UserAdmin overrides.

Thanks Justin Abrahms for the report.

Backport of 166e0490d3 from master
This commit is contained in:
Tim Graham 2015-12-08 14:40:55 -05:00
parent 975a451153
commit cdc354eb39
1 changed files with 5 additions and 5 deletions

View File

@ -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)