per-object-permissions: Merged to trunk [5486] NOTE: Not fully tested, will be working on this over the next few weeks.

git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@5488 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 37 insertions, 4 deletions

diff --git a/django/contrib/admin/views/auth.py b/django/contrib/admin/views/auth.py
index 52bf3bcde8..206e3eb7d4 100644
--- a/django/contrib/admin/views/auth.py
+++ b/django/contrib/admin/views/auth.py
@@ -1,10 +1,11 @@
 from django.contrib.admin.views.decorators import staff_member_required
-from django.contrib.auth.forms import UserCreationForm
+from django.contrib.auth.forms import UserCreationForm, AdminPasswordChangeForm
 from django.contrib.auth.models import User
 from django.core.exceptions import PermissionDenied
 from django import oldforms, template
-from django.shortcuts import render_to_response
+from django.shortcuts import render_to_response, get_object_or_404
 from django.http import HttpResponseRedirect
+from django.utils.html import escape
 
 def user_add_stage(request):
     if not request.user.has_perm('auth.change_user'):
@@ -16,7 +17,7 @@ def user_add_stage(request):
         if not errors:
             new_user = manipulator.save(new_data)
             msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': 'user', 'obj': new_user}
-            if request.POST.has_key("_addanother"):
+            if "_addanother" in request.POST:
                 request.user.message_set.create(message=msg)
                 return HttpResponseRedirect(request.path)
             else:
@@ -28,7 +29,7 @@ def user_add_stage(request):
     return render_to_response('admin/auth/user/add_form.html', {
         'title': _('Add user'),
         'form': form,
-        'is_popup': request.REQUEST.has_key('_popup'),
+        'is_popup': '_popup' in request.REQUEST,
         'add': True,
         'change': False,
         'has_add_permission': True,
@@ -43,3 +44,35 @@ def user_add_stage(request):
         'username_help_text': User._meta.get_field('username').help_text,
     }, context_instance=template.RequestContext(request))
 user_add_stage = staff_member_required(user_add_stage)
+
+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)
+    manipulator = AdminPasswordChangeForm(user)
+    if request.method == 'POST':
+        new_data = request.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if not errors:
+            new_user = manipulator.save(new_data)
+            msg = _('Password changed successfully.')
+            request.user.message_set.create(message=msg)
+            return HttpResponseRedirect('..')
+    else:
+        errors = new_data = {}
+    form = oldforms.FormWrapper(manipulator, new_data, errors)
+    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,
+        'first_form_field_id': 'id_password1',
+        'opts': User._meta,
+        'original': user,
+        'show_save': True,
+    }, context_instance=template.RequestContext(request))
+user_change_password = staff_member_required(user_change_password)