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

actions.py: Rename do_add_realm_alias() to do_add_realm_domain().

Browse Source
This commit is contained in:
Harshit Bansal
2017-03-31 17:53:34 +00:00
committed by Tim Abbott
parent 983225612d
commit 2da4fc0dc4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/actions.py
View File

@@ -3221,7 +3221,7 @@ def get_realm_domains(realm):
# type: (Realm) -> List[Dict[str, Text]] # type: (Realm) -> List[Dict[str, Text]]
return list(realm.realmdomain_set.values('domain', 'allow_subdomains')) 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) # type: (Realm, Text, bool) -> (RealmDomain)
alias = RealmDomain.objects.create(realm=realm, domain=domain, alias = RealmDomain.objects.create(realm=realm, domain=domain,
allow_subdomains=allow_subdomains) allow_subdomains=allow_subdomains)

4
zerver/tests/test_events.py
View File

@@ -70,7 +70,7 @@ from zerver.lib.actions import (
do_change_enable_online_push_notifications, do_change_enable_online_push_notifications,
do_change_pm_content_in_desktop_notifications, do_change_pm_content_in_desktop_notifications,
do_change_enable_digest_emails, do_change_enable_digest_emails,
do_add_realm_alias, do_add_realm_domain,
do_change_realm_alias, do_change_realm_alias,
do_remove_realm_alias, do_remove_realm_alias,
do_change_icon_source, do_change_icon_source,
@@ -1143,7 +1143,7 @@ class EventsRegisterTest(ZulipTestCase):
])), ])),
]) ])
realm = get_realm('zulip') 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]) error = schema_checker('events[0]', events[0])
self.assert_on_error(error) self.assert_on_error(error)

4
zerver/views/realm_aliases.py
View File

@@ -5,7 +5,7 @@ from django.http import HttpRequest, HttpResponse
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from zerver.decorator import has_request_variables, require_realm_admin, REQ 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 do_remove_realm_alias, get_realm_domains
from zerver.lib.domains import validate_domain from zerver.lib.domains import validate_domain
from zerver.lib.response import json_error, json_success 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}) return json_error(_("The domain %(domain)s is already a part of your organization.") % {'domain': domain})
if not can_add_realm_domain(domain): if not can_add_realm_domain(domain):
return json_error(_("The domain %(domain)s belongs to another organization.") % {'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]}) return json_success({'new_domain': [alias.id, alias.domain]})
@require_realm_admin @require_realm_admin