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

views/realm_aliases.py: realm_alias migration.

Browse Source 
* Rename `views/realm_aliases.py` to `views/realm_domains.py`.

* Remove any occurrences of `alias`.
This commit is contained in:
Harshit Bansal
2017-03-31 19:14:11 +00:00
committed by Tim Abbott
parent 664b23c495
commit b40a8ea20b
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
zerver/views/realm_aliases.py → zerver/views/realm_domains.py
View File

@@ -14,14 +14,14 @@ from zerver.models import can_add_realm_domain, RealmDomain, UserProfile
from typing import Text from typing import Text
def list_aliases(request, user_profile): def list_realm_domains(request, user_profile):
# type: (HttpRequest, UserProfile) -> (HttpResponse) # type: (HttpRequest, UserProfile) -> (HttpResponse)
aliases = get_realm_domains(user_profile.realm) domains = get_realm_domains(user_profile.realm)
return json_success({'domains': aliases}) return json_success({'domains': domains})
@require_realm_admin @require_realm_admin
@has_request_variables @has_request_variables
def create_alias(request, user_profile, domain=REQ(validator=check_string), allow_subdomains=REQ(validator=check_bool)): def create_realm_domain(request, user_profile, domain=REQ(validator=check_string), allow_subdomains=REQ(validator=check_bool)):
# type: (HttpRequest, UserProfile, Text, bool) -> (HttpResponse) # type: (HttpRequest, UserProfile, Text, bool) -> (HttpResponse)
domain = domain.strip().lower() domain = domain.strip().lower()
try: try:
@@ -32,27 +32,27 @@ 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_domain(user_profile.realm, domain, allow_subdomains) realm_domain = do_add_realm_domain(user_profile.realm, domain, allow_subdomains)
return json_success({'new_domain': [alias.id, alias.domain]}) return json_success({'new_domain': [realm_domain.id, realm_domain.domain]})
@require_realm_admin @require_realm_admin
@has_request_variables @has_request_variables
def patch_alias(request, user_profile, domain, allow_subdomains=REQ(validator=check_bool)): def patch_realm_domain(request, user_profile, domain, allow_subdomains=REQ(validator=check_bool)):
# type: (HttpRequest, UserProfile, Text, bool) -> (HttpResponse) # type: (HttpRequest, UserProfile, Text, bool) -> (HttpResponse)
try: try:
alias = RealmDomain.objects.get(realm=user_profile.realm, domain=domain) realm_domain = RealmDomain.objects.get(realm=user_profile.realm, domain=domain)
do_change_realm_domain(alias, allow_subdomains) do_change_realm_domain(realm_domain, allow_subdomains)
except RealmDomain.DoesNotExist: except RealmDomain.DoesNotExist:
return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain})) return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain}))
return json_success() return json_success()
@require_realm_admin @require_realm_admin
@has_request_variables @has_request_variables
def delete_alias(request, user_profile, domain): def delete_realm_domain(request, user_profile, domain):
# type: (HttpRequest, UserProfile, Text) -> (HttpResponse) # type: (HttpRequest, UserProfile, Text) -> (HttpResponse)
try: try:
alias = RealmDomain.objects.get(realm=user_profile.realm, domain=domain) realm_domain = RealmDomain.objects.get(realm=user_profile.realm, domain=domain)
do_remove_realm_domain(alias) do_remove_realm_domain(realm_domain)
except RealmDomain.DoesNotExist: except RealmDomain.DoesNotExist:
return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain})) return json_error(_('No entry found for domain %(domain)s.' % {'domain': domain}))
return json_success() return json_success()

10
zproject/urls.py
View File

@@ -172,13 +172,13 @@ v1_api_and_json_patterns = [
# Returns a 204, used by desktop app to verify connectivity status # Returns a 204, used by desktop app to verify connectivity status
url(r'generate_204$', zerver.views.registration.generate_204, name='zerver.views.registration.generate_204'), url(r'generate_204$', zerver.views.registration.generate_204, name='zerver.views.registration.generate_204'),
# realm/domains -> zerver.views.realm_aliases # realm/domains -> zerver.views.realm_domains
url(r'^realm/domains$', rest_dispatch, url(r'^realm/domains$', rest_dispatch,
{'GET': 'zerver.views.realm_aliases.list_aliases', {'GET': 'zerver.views.realm_domains.list_realm_domains',
'POST': 'zerver.views.realm_aliases.create_alias'}), 'POST': 'zerver.views.realm_domains.create_realm_domain'}),
url(r'^realm/domains/(?P<domain>\S+)$', rest_dispatch, url(r'^realm/domains/(?P<domain>\S+)$', rest_dispatch,
{'PATCH': 'zerver.views.realm_aliases.patch_alias', {'PATCH': 'zerver.views.realm_domains.patch_realm_domain',
'DELETE': 'zerver.views.realm_aliases.delete_alias'}), 'DELETE': 'zerver.views.realm_domains.delete_realm_domain'}),
# realm/emoji -> zerver.views.realm_emoji # realm/emoji -> zerver.views.realm_emoji
url(r'^realm/emoji$', rest_dispatch, url(r'^realm/emoji$', rest_dispatch,