Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

portico: Update error message for deactivated user. 

The installation admin is not the right person to get support requests from
deactivated users, regardless of the situation.

Also updates the wording to be a bit more concise.
This commit is contained in:
Rishi Gupta 2017-11-19 22:23:55 -08:00 committed by Tim Abbott
parent f202645bbd
commit 27babcf92b
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/forms.py
View File

@ -271,9 +271,8 @@ Please contact %s to reactivate this group.""" % (
if not user_profile.is_active and not user_profile.is_mirror_dummy: if not user_profile.is_active and not user_profile.is_mirror_dummy:
error_msg = ( error_msg = (
u"Sorry for the trouble, but your account has been deactivated. " u"Your account is no longer active. "
u"Please contact your organization administrator to reactivate it. " u"Please contact your organization administrator to reactivate it.")
u"If you're not sure who that is, try contacting %s.") % (FromAddress.SUPPORT,)
raise ValidationError(mark_safe(error_msg)) raise ValidationError(mark_safe(error_msg))
if not user_matches_subdomain(get_subdomain(self.request), user_profile): if not user_matches_subdomain(get_subdomain(self.request), user_profile):

4
zerver/tests/test_decorators.py
View File

@ -765,7 +765,7 @@ class InactiveUserTest(ZulipTestCase):
result = self.login_with_return(self.example_email("hamlet")) result = self.login_with_return(self.example_email("hamlet"))
self.assert_in_response( self.assert_in_response(
"Sorry for the trouble, but your account has been deactivated", "Your account is no longer active.",
result) result)
def test_login_deactivated_mirror_dummy(self) -> None: def test_login_deactivated_mirror_dummy(self) -> None:
@ -808,7 +808,7 @@ class InactiveUserTest(ZulipTestCase):
'password': password}) 'password': password})
with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',)): with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.EmailAuthBackend',)):
self.assertFalse(form.is_valid()) self.assertFalse(form.is_valid())
self.assertIn("your account has been deactivated", str(form.errors)) self.assertIn("Your account is no longer active", str(form.errors))
def test_webhook_deactivated_user(self) -> None: def test_webhook_deactivated_user(self) -> None:
""" """

2
zerver/tests/test_signup.py
View File

@ -322,7 +322,7 @@ class LoginTest(ZulipTestCase):
do_deactivate_user(user_profile) do_deactivate_user(user_profile)
result = self.login_with_return(self.example_email("hamlet"), "xxx") result = self.login_with_return(self.example_email("hamlet"), "xxx")
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
self.assert_in_response("your account has been deactivated.", result) self.assert_in_response("Your account is no longer active.", result)
self.assertIsNone(get_session_dict_user(self.client.session)) self.assertIsNone(get_session_dict_user(self.client.session))
def test_login_bad_password(self): def test_login_bad_password(self):