1
0
mirror of https://github.com/django/django.git synced 2024-12-24 01:55:49 +00:00

[1.7.x] Fixed #22515 -- Fixed the object_id of the LogEntry that's created after a user password change in the admin.

Thanks ross at servercode.co.uk for the report.

Backport of 9e7f86b890 from master
This commit is contained in:
Tim Graham 2014-04-25 08:20:25 -04:00
parent 782fa14db4
commit 6d87acc390
3 changed files with 18 additions and 2 deletions

View File

@ -130,7 +130,7 @@ class UserAdmin(admin.ModelAdmin):
if form.is_valid():
form.save()
change_message = self.construct_change_message(request, form, None)
self.log_change(request, request.user, change_message)
self.log_change(request, user, change_message)
msg = ugettext('Password changed successfully.')
messages.success(request, msg)
update_session_auth_hash(request, form.user)

View File

@ -867,3 +867,15 @@ class ChangelistTests(AuthViewsTestCase):
self.assertEqual(row.change_message, 'Changed password.')
self.logout()
self.login(password='password1')
def test_user_change_different_user_password(self):
u = User.objects.get(email='staffmember@example.com')
response = self.client.post('/admin/auth/user/%s/password/' % u.pk, {
'password1': 'password1',
'password2': 'password1',
})
self.assertRedirects(response, '/admin/auth/user/%s/' % u.pk)
row = LogEntry.objects.latest('id')
self.assertEqual(row.user_id, self.admin.pk)
self.assertEqual(row.object_id, str(u.pk))
self.assertEqual(row.change_message, 'Changed password.')

View File

@ -15,4 +15,8 @@ Bugfixes
* Restored the ability to :meth:`~django.core.urlresolvers.reverse` views
created using :func:`functools.partial()`
(`#22486 <http://code.djangoproject.com/ticket/22486>`_)
(`#22486 <http://code.djangoproject.com/ticket/22486>`_).
* Fixed the ``object_id`` of the ``LogEntry`` that's created after a user
password change in the admin
(`#22515 <http://code.djangoproject.com/ticket/22515>`_).