Changeset 4266

Timestamp:

12/30/06 01:16:25 (2 years ago)

Author:

adrian

Message:

Fixed #3166 -- Added admin 'Change user password' view. Thanks for the patch, SmileyChris?

Files:

• django/trunk/django/contrib/admin/templates/admin/auth/user/change_password.html (added)
• django/trunk/django/contrib/admin/urls.py (modified) (1 diff)
• django/trunk/django/contrib/admin/views/auth.py (modified) (2 diffs)
• django/trunk/django/contrib/auth/forms.py (modified) (1 diff)
• django/trunk/django/contrib/auth/models.py (modified) (1 diff)

django/trunk/django/contrib/admin/urls.py

@@ -30 +30 @@
-    # "Add user" -- a special-case view
-    ('^auth/user/add/$', 'django.contrib.admin.views.auth.user_add_stage'),
+    # "Change user password" -- another special-case view
+    ('^auth/user/(\d+)/password/$', 'django.contrib.admin.views.auth.user_change_password'),
-
-    # Add/change/delete/history

django/trunk/django/contrib/admin/views/auth.py

@@ -1 +1 @@
-from django.contrib.admin.views.decorators import staff_member_required
-
+, AdminPasswordChangeForm
-from django.contrib.auth.models import User
-from django.core.exceptions import PermissionDenied
-from django import oldforms, template
-
+, get_object_or_404
-from django.http import HttpResponseRedirect
+from django.utils.html import escape
-
-def user_add_stage(request):
@@ -43 +44 @@
-    }, 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': request.REQUEST.has_key('_popup'),
+        '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)

django/trunk/django/contrib/auth/forms.py

@@ -127 +127 @@
-        self.user.set_password(new_data['new_password1'])
-        self.user.save()
+
+class AdminPasswordChangeForm(oldforms.Manipulator):
+    "A form used to change the password of a user in the admin interface."
+    def __init__(self, user):
+        self.user = user
+        self.fields = (
+            oldforms.PasswordField(field_name='password1', length=30, maxlength=60, is_required=True),
+            oldforms.PasswordField(field_name='password2', length=30, maxlength=60, is_required=True,
+                validator_list=[validators.AlwaysMatchesOtherField('password1', _("The two password fields didn't match."))]),
+        )
+
+    def save(self, new_data):
+        "Saves the new password."
+        self.user.set_password(new_data['password1'])
+        self.user.save()

django/trunk/django/contrib/auth/models.py

@@ -92 +92 @@
-    last_name = models.CharField(_('last name'), maxlength=30, blank=True)
-    email = models.EmailField(_('e-mail address'), blank=True)
-
+ or use the <a href=\"password/\">change password form</a>.
-    is_staff = models.BooleanField(_('staff status'), default=False, help_text=_("Designates whether the user can log into this admin site."))
-    is_active = models.BooleanField(_('active'), default=True, help_text=_("Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts."))