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

support: Send confirmation email on realm activation.

Browse Source
This commit is contained in:
Vishnu Ks
2019-11-17 08:51:46 +00:00
committed by Tim Abbott
parent 8b55a310f1
commit a26b379a14
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
analytics/tests/test_views.py
View File

@@ -515,10 +515,10 @@ class TestSupportEndpoint(ZulipTestCase):
m.assert_called_once_with(lear_realm, self.example_user("iago")) m.assert_called_once_with(lear_realm, self.example_user("iago"))
self.assert_in_success_response(["Lear & Co. deactivated"], result) self.assert_in_success_response(["Lear & Co. deactivated"], result)
with mock.patch("analytics.views.do_reactivate_realm") as m: with mock.patch("analytics.views.do_send_realm_reactivation_email") as m:
result = self.client_post("/activity/support", {"realm_id": "%s" % (lear_realm.id,), "status": "active"}) result = self.client_post("/activity/support", {"realm_id": "%s" % (lear_realm.id,), "status": "active"})
m.assert_called_once_with(lear_realm) m.assert_called_once_with(lear_realm)
self.assert_in_success_response(["Lear & Co. reactivated."], result) self.assert_in_success_response(["Realm reactivation email sent to admins of Lear"], result)
def test_scrub_realm(self) -> None: def test_scrub_realm(self) -> None:
lear_realm = get_realm("lear") lear_realm = get_realm("lear")

6
analytics/views.py
View File

@@ -40,7 +40,7 @@ from zerver.lib.realm_icon import realm_icon_url
from zerver.views.invite import get_invitee_emails_set from zerver.views.invite import get_invitee_emails_set
from zerver.lib.subdomains import get_subdomain_from_hostname from zerver.lib.subdomains import get_subdomain_from_hostname
from zerver.lib.actions import do_change_plan_type, do_deactivate_realm, \ from zerver.lib.actions import do_change_plan_type, do_deactivate_realm, \
do_reactivate_realm, do_scrub_realm do_send_realm_reactivation_email, do_scrub_realm
from confirmation.settings import STATUS_ACTIVE from confirmation.settings import STATUS_ACTIVE
if settings.BILLING_ENABLED: if settings.BILLING_ENABLED:
@@ -1098,8 +1098,8 @@ def support(request: HttpRequest) -> HttpResponse:
status = request.POST.get("status", None) status = request.POST.get("status", None)
if status is not None: if status is not None:
if status == "active": if status == "active":
do_reactivate_realm(realm) do_send_realm_reactivation_email(realm)
context["message"] = "{} reactivated.".format(realm.name) context["message"] = "Realm reactivation email sent to admins of {}.".format(realm.name)
elif status == "deactivated": elif status == "deactivated":
do_deactivate_realm(realm, request.user) do_deactivate_realm(realm, request.user)
context["message"] = "{} deactivated.".format(realm.name) context["message"] = "{} deactivated.".format(realm.name)