Fixed #8202 -- Moved user_change_password to UserAdmin. This enables seamless integration of a custom UserAdmin. Thanks ElliottM for catching this.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8283 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 0 insertions, 30 deletions

diff --git a/django/contrib/auth/views.py b/django/contrib/auth/views.py
index e503f87caa..d7aa05b8cb 100644
--- a/django/contrib/auth/views.py
+++ b/django/contrib/auth/views.py
@@ -149,33 +149,3 @@ password_change = login_required(password_change)
 
 def password_change_done(request, template_name='registration/password_change_done.html'):
     return render_to_response(template_name, context_instance=RequestContext(request))
-
-# TODO: move to admin.py in the ModelAdmin
-def user_change_password(request, id):
-    if not request.user.has_perm('auth.change_user'):
-        raise PermissionDenied
-    user = get_object_or_404(User, pk=id)
-    if request.method == 'POST':
-        form = AdminPasswordChangeForm(user, request.POST)
-        if form.is_valid():
-            new_user = form.save()
-            msg = _('Password changed successfully.')
-            request.user.message_set.create(message=msg)
-            return HttpResponseRedirect('..')
-    else:
-        form = AdminPasswordChangeForm(user)
-    return render_to_response('admin/auth/user/change_password.html', {
-        'title': _('Change password: %s') % escape(user.username),
-        'form': form,
-        'is_popup': '_popup' in request.REQUEST,
-        'add': True,
-        'change': False,
-        'has_delete_permission': False,
-        'has_change_permission': True,
-        'has_absolute_url': False,
-        'opts': User._meta,
-        'original': user,
-        'save_as': False,
-        'show_save': True,
-        'root_path': re.sub('auth/user/(\d+)/password/$', '', request.path),
-    }, context_instance=RequestContext(request))