Fix reset email message

wendixiang · Jan 17, 2017 · 622fe27 · 622fe27
1 parent e906778
commit 622fe27
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
@@ -923,7 +923,7 @@ def user_reset(request, email):
                     contact_email = Profile.objects.get_contact_email_by_user(user.email)
                     send_user_reset_email(request, contact_email, new_password)
                     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)
                 except Exception, e:
                     logger.error(str(e))

diff --git a/tests/seahub/views/sysadmin/test_user_reset.py b/tests/seahub/views/sysadmin/test_user_reset.py
@@ -30,7 +30,7 @@ def test_can_send_reset_email_to_contact_email(self):
             reverse('user_reset', args=[self.user.email])
         )
         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)
         assert mail.outbox[0].to[0] != self.user.username