paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

support: Rename deactive to deactivated.

Browse Source
This commit is contained in:
Rishi Gupta
2019-05-07 21:05:18 -07:00
committed by Tim Abbott
parent d2b32749cc
commit 98da11c558
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
analytics/tests/test_views.py
View File

@@ -341,7 +341,7 @@ class TestSupportEndpoint(ZulipTestCase):
'<option value="2" >Limited</option>', '<option value="2" >Limited</option>',
'input type="number" name="discount" value="None"', 'input type="number" name="discount" value="None"',
'<option value="active" selected>Active</option>', '<option value="active" selected>Active</option>',
'<option value="deactive" >Deactive</option>', '<option value="deactivated" >Deactivated</option>',
'scrub-realm-button">', 'scrub-realm-button">',
'data-string-id="zulip"'], result) 'data-string-id="zulip"'], result)
@@ -351,7 +351,7 @@ class TestSupportEndpoint(ZulipTestCase):
'<option value="2" >Limited</option>', '<option value="2" >Limited</option>',
'input type="number" name="discount" value="None"', 'input type="number" name="discount" value="None"',
'<option value="active" selected>Active</option>', '<option value="active" selected>Active</option>',
'<option value="deactive" >Deactive</option>', '<option value="deactivated" >Deactivated</option>',
'scrub-realm-button">', 'scrub-realm-button">',
'data-string-id="lear"'], result) 'data-string-id="lear"'], result)
@@ -428,7 +428,7 @@ class TestSupportEndpoint(ZulipTestCase):
cordelia_email = self.example_email("cordelia") cordelia_email = self.example_email("cordelia")
self.login(cordelia_email) self.login(cordelia_email)
result = self.client_post("/activity/support", {"realm_id": "3", "status": "deactive"}) result = self.client_post("/activity/support", {"realm_id": "3", "status": "deactivated"})
self.assertEqual(result.status_code, 302) self.assertEqual(result.status_code, 302)
self.assertEqual(result["Location"], "/login/") self.assertEqual(result["Location"], "/login/")
@@ -436,7 +436,7 @@ class TestSupportEndpoint(ZulipTestCase):
self.login(iago_email) self.login(iago_email)
with mock.patch("analytics.views.do_deactivate_realm") as m: with mock.patch("analytics.views.do_deactivate_realm") as m:
result = self.client_post("/activity/support", {"realm_id": "3", "status": "deactive"}) result = self.client_post("/activity/support", {"realm_id": "3", "status": "deactivated"})
m.assert_called_once_with(get_realm("lear")) m.assert_called_once_with(get_realm("lear"))
self.assert_in_success_response(["Lear &amp; Co. deactivated"], result) self.assert_in_success_response(["Lear &amp; Co. deactivated"], result)

2
analytics/views.py
View File

@@ -1058,7 +1058,7 @@ def support(request: HttpRequest) -> HttpResponse:
if status == "active": if status == "active":
do_reactivate_realm(realm) do_reactivate_realm(realm)
context["message"] = "{} reactivated.".format(realm.name) context["message"] = "{} reactivated.".format(realm.name)
elif status == "deactive": elif status == "deactivated":
do_deactivate_realm(realm) do_deactivate_realm(realm)
context["message"] = "{} deactivated.".format(realm.name) context["message"] = "{} deactivated.".format(realm.name)

4
templates/analytics/support.html
View File

@@ -53,7 +53,7 @@
<input type="hidden" name="realm_id" value="{{ user.realm.id }}" /> <input type="hidden" name="realm_id" value="{{ user.realm.id }}" />
<select name="status"> <select name="status">
<option value="active" {% if not user.realm.deactivated %}selected{% endif %}>Active</option> <option value="active" {% if not user.realm.deactivated %}selected{% endif %}>Active</option>
<option value="deactive" {% if user.realm.deactivated %}selected{% endif %}>Deactive</option> <option value="deactivated" {% if user.realm.deactivated %}selected{% endif %}>Deactivated</option>
</select> </select>
<button type="submit" class="button rounded small support-submit-button">Update</button> <button type="submit" class="button rounded small support-submit-button">Update</button>
</form> </form>
@@ -100,7 +100,7 @@
<input type="hidden" name="realm_id" value="{{ realm.id }}" /> <input type="hidden" name="realm_id" value="{{ realm.id }}" />
<select name="status"> <select name="status">
<option value="active" {% if not realm.deactivated %}selected{% endif %}>Active</option> <option value="active" {% if not realm.deactivated %}selected{% endif %}>Active</option>
<option value="deactive" {% if realm.deactivated %}selected{% endif %}>Deactive</option> <option value="deactivated" {% if realm.deactivated %}selected{% endif %}>Deactivated</option>
</select> </select>
<button type="submit" class="button rounded small support-submit-button">Update</button> <button type="submit" class="button rounded small support-submit-button">Update</button>
</form> </form>

2
zerver/tests/test_realm.py
View File

@@ -185,7 +185,7 @@ class RealmTest(ZulipTestCase):
do_deactivate_realm(user.realm) do_deactivate_realm(user.realm)
self.assertEqual(ScheduledEmail.objects.count(), 0) self.assertEqual(ScheduledEmail.objects.count(), 0)
def test_do_deactivate_realm_on_deactived_realm(self) -> None: def test_do_deactivate_realm_on_deactivated_realm(self) -> None:
"""Ensure early exit is working in realm deactivation""" """Ensure early exit is working in realm deactivation"""
realm = get_realm('zulip') realm = get_realm('zulip')
self.assertFalse(realm.deactivated) self.assertFalse(realm.deactivated)