diff options
| author | Tim Graham <timograham@gmail.com> | 2015-10-26 18:38:30 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-10-27 08:18:22 -0400 |
| commit | 5acf203db2e9562dbe4073bf85d5043ef3121ea9 (patch) | |
| tree | a79cd6278b049f7c5a107d11b1c0a124e249d66f /django | |
| parent | 1f07da3e29c7c3d47968e1c4531dd9bf902575b7 (diff) | |
Fixed #25596 -- Fixed regression in password change view with custom user model.
The reverse() added in 50aa1a790ca66c2a93e0a52e00c53375b269ff49
crashed on a custom user model.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/auth/admin.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py index 76345e92f5..37b68f222f 100644 --- a/django/contrib/auth/admin.py +++ b/django/contrib/auth/admin.py @@ -148,8 +148,9 @@ class UserAdmin(admin.ModelAdmin): update_session_auth_hash(request, form.user) return HttpResponseRedirect( reverse( - '%s:auth_%s_change' % ( + '%s:%s_%s_change' % ( self.admin_site.name, + user._meta.app_label, user._meta.model_name, ), args=(user.pk,), @@ -178,7 +179,7 @@ class UserAdmin(admin.ModelAdmin): 'save_as': False, 'show_save': True, } - context.update(admin.site.each_context(request)) + context.update(self.admin_site.each_context(request)) request.current_app = self.admin_site.name |