diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-11-29 08:19:59 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-11-29 10:31:09 -0500 |
| commit | c8dcded930a1d0ee5688ae2c2eeb8c33d942009f (patch) | |
| tree | 319e9868f808bca0cef788330a33225f42a3c9b7 /django | |
| parent | 3131e9cef5f0a96f4fe667b0b1626c238153d1f1 (diff) | |
Fixed #17890 -- Added an extra_context parameter to AdminSite.password_change().
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/sites.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index e310635eea..3a69afda4a 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -281,7 +281,7 @@ class AdminSite(object): 'site_url': self.site_url, } - def password_change(self, request): + def password_change(self, request, extra_context=None): """ Handles the "change password" task -- both form display and validation. """ @@ -292,7 +292,7 @@ class AdminSite(object): 'current_app': self.name, 'password_change_form': AdminPasswordChangeForm, 'post_change_redirect': url, - 'extra_context': self.each_context(), + 'extra_context': dict(self.each_context(), **(extra_context or {})), } if self.password_change_template is not None: defaults['template_name'] = self.password_change_template |