paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 10:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

actions.py: Rename get_realm_aliases() to get_realm_domains().

Browse Source
This commit is contained in:
Harshit Bansal
2017-03-31 17:46:43 +00:00
committed by Tim Abbott
parent 582d8a351f
commit 983225612d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/actions.py
View File

@@ -3217,7 +3217,7 @@ def get_emails_from_user_ids(user_ids):
# We may eventually use memcached to speed this up, but the DB is fast. # We may eventually use memcached to speed this up, but the DB is fast.
return UserProfile.emails_from_ids(user_ids) return UserProfile.emails_from_ids(user_ids)
def get_realm_aliases(realm): 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'))

4
zerver/lib/events.py
View File

@@ -26,7 +26,7 @@ from zerver.lib.realm_icon import realm_icon_url
from zerver.lib.request import JsonableError from zerver.lib.request import JsonableError
from zerver.lib.actions import validate_user_access_to_subscribers_helper, \ from zerver.lib.actions import validate_user_access_to_subscribers_helper, \
do_get_streams, get_default_streams_for_realm, \ do_get_streams, get_default_streams_for_realm, \
gather_subscriptions_helper, get_realm_aliases, \ gather_subscriptions_helper, get_realm_domains, \
get_status_dict, streams_to_dicts_sorted get_status_dict, streams_to_dicts_sorted
from zerver.tornado.event_queue import request_event_queue, get_user_events from zerver.tornado.event_queue import request_event_queue, get_user_events
from zerver.models import Client, Message, UserProfile, \ from zerver.models import Client, Message, UserProfile, \
@@ -119,7 +119,7 @@ def fetch_initial_state_data(user_profile, event_types, queue_id,
state['realm_bot_domain'] = user_profile.realm.get_bot_domain() state['realm_bot_domain'] = user_profile.realm.get_bot_domain()
if want('realm_domains'): if want('realm_domains'):
state['realm_domains'] = get_realm_aliases(user_profile.realm) state['realm_domains'] = get_realm_domains(user_profile.realm)
if want('realm_emoji'): if want('realm_emoji'):
state['realm_emoji'] = user_profile.realm.get_emoji() state['realm_emoji'] = user_profile.realm.get_emoji()

4
zerver/management/commands/realm_alias.py
View File

@@ -10,7 +10,7 @@ from django.db.utils import IntegrityError
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from zerver.models import get_realm, can_add_realm_domain, \ from zerver.models import get_realm, can_add_realm_domain, \
Realm, RealmDomain Realm, RealmDomain
from zerver.lib.actions import get_realm_aliases from zerver.lib.actions import get_realm_domains
from zerver.lib.domains import validate_domain from zerver.lib.domains import validate_domain
import sys import sys
@@ -42,7 +42,7 @@ class Command(BaseCommand):
realm = get_realm(options["string_id"]) realm = get_realm(options["string_id"])
if options["op"] == "show": if options["op"] == "show":
print("Aliases for %s:" % (realm.string_id,)) print("Aliases for %s:" % (realm.string_id,))
for alias in get_realm_aliases(realm): for alias in get_realm_domains(realm):
if alias["allow_subdomains"]: if alias["allow_subdomains"]:
print(alias["domain"] + " (subdomains allowed)") print(alias["domain"] + " (subdomains allowed)")
else: else:

4
zerver/views/realm_aliases.py
View File

@@ -6,7 +6,7 @@ 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_alias, do_change_realm_alias, \
do_remove_realm_alias, get_realm_aliases 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
from zerver.lib.validator import check_bool, check_string from zerver.lib.validator import check_bool, check_string
@@ -16,7 +16,7 @@ from typing import Text
def list_aliases(request, user_profile): def list_aliases(request, user_profile):
# type: (HttpRequest, UserProfile) -> (HttpResponse) # type: (HttpRequest, UserProfile) -> (HttpResponse)
aliases = get_realm_aliases(user_profile.realm) aliases = get_realm_domains(user_profile.realm)
return json_success({'domains': aliases}) return json_success({'domains': aliases})
@require_realm_admin @require_realm_admin