mirror of
https://github.com/zulip/zulip.git
synced 2025-11-02 13:03:29 +00:00
Move name_changes_disabled to zerver.models
This commit is contained in:
@@ -125,6 +125,12 @@ def get_realm_emoji_cache_key(realm):
|
||||
# type: (Realm) -> text_type
|
||||
return u'realm_emoji:%s' % (realm.id,)
|
||||
|
||||
def name_changes_disabled(realm):
|
||||
# type: (Optional[Realm]) -> bool
|
||||
if realm is None:
|
||||
return settings.NAME_CHANGES_DISABLED
|
||||
return settings.NAME_CHANGES_DISABLED or realm.name_changes_disabled
|
||||
|
||||
class Realm(ModelReprMixin, models.Model):
|
||||
# domain is a domain in the Internet sense. It must be structured like a
|
||||
# valid email domain. We use is to restrict access, identify bots, etc.
|
||||
|
||||
@@ -22,7 +22,7 @@ from zerver.models import Message, UserProfile, Stream, Subscription, Huddle, \
|
||||
Recipient, Realm, UserMessage, DefaultStream, RealmEmoji, RealmAlias, \
|
||||
RealmFilter, \
|
||||
PreregistrationUser, get_client, UserActivity, \
|
||||
get_stream, UserPresence, get_recipient, \
|
||||
get_stream, UserPresence, get_recipient, name_changes_disabled, \
|
||||
split_email_to_domain, resolve_email_to_domain, email_to_username, get_realm, \
|
||||
completely_open, get_unique_open_realm, remote_user_to_email, email_allowed_for_realm, \
|
||||
get_cross_realm_users, resolve_subdomain_to_realm
|
||||
@@ -72,12 +72,6 @@ import os
|
||||
|
||||
from zproject.jinja2 import render_to_response
|
||||
|
||||
def name_changes_disabled(realm):
|
||||
# type: (Optional[Realm]) -> bool
|
||||
if realm is None:
|
||||
return settings.NAME_CHANGES_DISABLED
|
||||
return settings.NAME_CHANGES_DISABLED or realm.name_changes_disabled
|
||||
|
||||
@require_post
|
||||
def accounts_register(request):
|
||||
# type: (HttpRequest) -> HttpResponse
|
||||
|
||||
@@ -23,11 +23,7 @@ from zerver.lib.response import json_success, json_error
|
||||
from zerver.lib.upload import upload_avatar_image
|
||||
from zerver.lib.validator import check_bool, check_string
|
||||
from zerver.lib.request import JsonableError
|
||||
from zerver.models import UserProfile, Realm
|
||||
|
||||
def name_changes_disabled(realm):
|
||||
# type: (Realm) -> bool
|
||||
return settings.NAME_CHANGES_DISABLED or realm.name_changes_disabled
|
||||
from zerver.models import UserProfile, Realm, name_changes_disabled
|
||||
|
||||
@authenticated_json_post_view
|
||||
@has_request_variables
|
||||
|
||||
Reference in New Issue
Block a user