diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2012-12-03 20:39:03 -0300 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2012-12-04 01:13:01 -0300 |
| commit | b64d30405a3d5468dc8c6232747d45bbeee4f7bb (patch) | |
| tree | 27a3ced1e493ab93a66b216eea51e4e2581d1acc /django | |
| parent | 88e17156393be86df64d44554de8ab77a6d3ed7d (diff) | |
Fixed #18697 -- Made values accepted for two customizable admin templates consistent.
Thanks and at cloverfastfood dot com for the report.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/sites.py | 6 | ||||
| -rw-r--r-- | django/contrib/auth/admin.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index 94d86026c4..185417015a 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -391,9 +391,9 @@ class AdminSite(object): '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 diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py index 86442b9078..d15a387a7e 100644 --- a/django/contrib/auth/admin.py +++ b/django/contrib/auth/admin.py @@ -148,10 +148,10 @@ class UserAdmin(admin.ModelAdmin): '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): """ |