haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-21 11:27:18 +00:00
Code Issues Releases Wiki Activity

Fix reset email message

Browse Source
This commit is contained in:
zhengxie
2017-01-17 16:08:03 +08:00
parent e9067789c9
commit 622fe2705e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/views/sysadmin.py
View File

@@ -923,7 +923,7 @@ def user_reset(request, email):
contact_email = Profile.objects.get_contact_email_by_user(user.email) contact_email = Profile.objects.get_contact_email_by_user(user.email)
send_user_reset_email(request, contact_email, new_password) send_user_reset_email(request, contact_email, new_password)
msg = _('Successfully reset password to %(passwd)s, an email has been sent to %(user)s.') % \ msg = _('Successfully reset password to %(passwd)s, an email has been sent to %(user)s.') % \
{'passwd': new_password, 'user': user.email} {'passwd': new_password, 'user': contact_email}
messages.success(request, msg) messages.success(request, msg)
except Exception, e: except Exception, e:
logger.error(str(e)) logger.error(str(e))

2
tests/seahub/views/sysadmin/test_user_reset.py
View File

@@ -30,7 +30,7 @@ class UserResetTest(BaseTestCase):
reverse('user_reset', args=[self.user.email]) reverse('user_reset', args=[self.user.email])
) )
self.assertEqual(302, resp.status_code) self.assertEqual(302, resp.status_code)
assert 'email has been sent' in parse_cookie(resp.cookies)['messages'] assert 'email has been sent to contact@mail.com' in parse_cookie(resp.cookies)['messages']
self.assertEqual(len(mail.outbox), 1) self.assertEqual(len(mail.outbox), 1)
assert mail.outbox[0].to[0] != self.user.username assert mail.outbox[0].to[0] != self.user.username