Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #18697 -- Made values accepted for two customizable admin templ…

…ates consistent.

Thanks and at cloverfastfood dot com for the report.
  • Loading branch information...
commit b64d30405a3d5468dc8c6232747d45bbeee4f7bb 1 parent 88e1715
Ramiro Morales ramiro authored
6 django/contrib/admin/sites.py
View
@@ -391,9 +391,9 @@ def index(self, request, extra_context=None):
'app_list': app_list,
}
context.update(extra_context or {})
- return TemplateResponse(request, [
- self.index_template or 'admin/index.html',
- ], context, current_app=self.name)
+ return TemplateResponse(request, self.index_template or
+ 'admin/index.html', context,
+ current_app=self.name)
def app_index(self, request, app_label, extra_context=None):
user = request.user
6 django/contrib/auth/admin.py
View
@@ -148,10 +148,10 @@ def user_change_password(self, request, id, form_url=''):
'save_as': False,
'show_save': True,
}
- return TemplateResponse(request, [
+ return TemplateResponse(request,
self.change_user_password_template or
- 'admin/auth/user/change_password.html'
- ], context, current_app=self.admin_site.name)
+ 'admin/auth/user/change_password.html',
+ context, current_app=self.admin_site.name)
def response_add(self, request, obj, **kwargs):
"""
9 tests/regressiontests/admin_views/customadmin.py
View
@@ -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 @@ def queryset(self, request):
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 @@ def queryset(self, request):
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)
14 tests/regressiontests/admin_views/tests.py
View
@@ -770,7 +770,10 @@ def testCustomAdminSiteLogoutTemplate(self):
self.assertContains(response, 'Hello from a custom logout template')
def testCustomAdminSiteIndexViewAndTemplate(self):
- response = self.client.get('/test_admin/admin2/')
+ try:
+ response = self.client.get('/test_admin/admin2/')
+ except TypeError:
+ self.fail('AdminSite.index_template should accept a list of template paths')
self.assertIsInstance(response, TemplateResponse)
self.assertTemplateUsed(response, 'custom_admin/index.html')
self.assertContains(response, 'Hello from a custom index template *bar*')
@@ -792,6 +795,15 @@ def testCustomAdminSiteView(self):
response = self.client.get('/test_admin/%s/my_view/' % self.urlbit)
self.assertEqual(response.content, b"Django is a magical pony!")
+ def test_pwd_change_custom_template(self):
+ self.client.login(username='super', password='secret')
+ su = User.objects.get(username='super')
+ try:
+ response = self.client.get('/test_admin/admin4/auth/user/%s/password/' % su.pk)
+ except TypeError:
+ self.fail('ModelAdmin.change_user_password_template should accept a list of template paths')
+ self.assertEqual(response.status_code, 200)
+
def get_perm(Model, perm):
"""Return the permission object, for the Model"""
1  tests/regressiontests/admin_views/urls.py
View
@@ -11,4 +11,5 @@
(r'^test_admin/admin/', include(admin.site.urls)),
(r'^test_admin/admin2/', include(customadmin.site.urls)),
(r'^test_admin/admin3/', include(admin.site.urls), dict(form_url='pony')),
+ (r'^test_admin/admin4/', include(customadmin.simple_site.urls)),
)
Please sign in to comment.
Something went wrong with that request. Please try again.