From 2da4fc0dc4f0b60ea3da602620343465a6fd5277 Mon Sep 17 00:00:00 2001 From: Harshit Bansal Date: Fri, 31 Mar 2017 17:53:34 +0000 Subject: [PATCH] actions.py: Rename `do_add_realm_alias()` to `do_add_realm_domain()`. --- zerver/lib/actions.py | 2 +- zerver/tests/test_events.py | 4 ++-- zerver/views/realm_aliases.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index bd01b137da..739695fb7f 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -3221,7 +3221,7 @@ def get_realm_domains(realm): # type: (Realm) -> List[Dict[str, Text]] return list(realm.realmdomain_set.values('domain', 'allow_subdomains')) -def do_add_realm_alias(realm, domain, allow_subdomains): +def do_add_realm_domain(realm, domain, allow_subdomains): # type: (Realm, Text, bool) -> (RealmDomain) alias = RealmDomain.objects.create(realm=realm, domain=domain, allow_subdomains=allow_subdomains) diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index e2093003a3..503c512559 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -70,7 +70,7 @@ from zerver.lib.actions import ( do_change_enable_online_push_notifications, do_change_pm_content_in_desktop_notifications, do_change_enable_digest_emails, - do_add_realm_alias, + do_add_realm_domain, do_change_realm_alias, do_remove_realm_alias, do_change_icon_source, @@ -1143,7 +1143,7 @@ class EventsRegisterTest(ZulipTestCase): ])), ]) realm = get_realm('zulip') - events = self.do_test(lambda: do_add_realm_alias(realm, 'zulip.org', False)) + events = self.do_test(lambda: do_add_realm_domain(realm, 'zulip.org', False)) error = schema_checker('events[0]', events[0]) self.assert_on_error(error) diff --git a/zerver/views/realm_aliases.py b/zerver/views/realm_aliases.py index 208152e800..4a88e355a0 100644 --- a/zerver/views/realm_aliases.py +++ b/zerver/views/realm_aliases.py @@ -5,7 +5,7 @@ from django.http import HttpRequest, HttpResponse from django.utils.translation import ugettext as _ from zerver.decorator import has_request_variables, require_realm_admin, REQ -from zerver.lib.actions import do_add_realm_alias, do_change_realm_alias, \ +from zerver.lib.actions import do_add_realm_domain, do_change_realm_alias, \ do_remove_realm_alias, get_realm_domains from zerver.lib.domains import validate_domain from zerver.lib.response import json_error, json_success @@ -32,7 +32,7 @@ def create_alias(request, user_profile, domain=REQ(validator=check_string), allo return json_error(_("The domain %(domain)s is already a part of your organization.") % {'domain': domain}) if not can_add_realm_domain(domain): return json_error(_("The domain %(domain)s belongs to another organization.") % {'domain': domain}) - alias = do_add_realm_alias(user_profile.realm, domain, allow_subdomains) + alias = do_add_realm_domain(user_profile.realm, domain, allow_subdomains) return json_success({'new_domain': [alias.id, alias.domain]}) @require_realm_admin