mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

[1.5.x] Fixed #18697 -- Made values accepted for two customizable admin templates consistent.

Browse Source 
Thanks and at cloverfastfood dot com for the report.

b64d30405a from master.
This commit is contained in:
Ramiro Morales
2012-12-03 20:39:03 -03:00
parent b6f67bd50e
commit 6a098aa6f2
5 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/regressiontests/admin_views/customadmin.py
View File

@@ -16,7 +16,7 @@ class Admin2(admin.AdminSite):
login_form = forms.CustomAdminAuthenticationForm
login_template = 'custom_admin/login.html'
logout_template = 'custom_admin/logout.html'
index_template = 'custom_admin/index.html'
index_template = ['custom_admin/index.html'] # a list, to test fix for #18697
password_change_template = 'custom_admin/password_change_form.html'
password_change_done_template = 'custom_admin/password_change_done.html'
@@ -40,6 +40,10 @@ class UserLimitedAdmin(UserAdmin):
return qs.filter(is_superuser=False)
class CustomPwdTemplateUserAdmin(UserAdmin):
change_user_password_template = ['admin/auth/user/change_password.html'] # a list, to test fix for #18697
site = Admin2(name="admin2")
site.register(models.Article, base_admin.ArticleAdmin)
@@ -50,3 +54,6 @@ site.register(models.ChapterXtra1, base_admin.ChapterXtra1Admin)
site.register(User, UserLimitedAdmin)
site.register(models.UndeletableObject, base_admin.UndeletableObjectAdmin)
site.register(models.Simple, base_admin.AttributeErrorRaisingAdmin)
simple_site = Admin2(name='admin4')
simple_site.register(User, CustomPwdTemplateUserAdmin)