From 5acf203db2e9562dbe4073bf85d5043ef3121ea9 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 26 Oct 2015 18:38:30 -0400 Subject: Fixed #25596 -- Fixed regression in password change view with custom user model. The reverse() added in 50aa1a790ca66c2a93e0a52e00c53375b269ff49 crashed on a custom user model. --- django/contrib/auth/admin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'django') 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 -- cgit v1.3