-
@@ -154,6 +181,11 @@ if ($('#id_email:visible').length) {
} else if ($('#id_full_name:visible').length) {
autofocus('#id_full_name');
}
+
+$("[name=realm_org_type]").on("change", function () {
+ $(".blob").hide();
+ $("#org_type_blob_" + this.value).show();
+});
{% endblock %}
diff --git a/zerver/forms.py b/zerver/forms.py
index 21e216ad04..3c7d8ff31f 100644
--- a/zerver/forms.py
+++ b/zerver/forms.py
@@ -84,6 +84,10 @@ class RegistrationForm(forms.Form):
required=False)
realm_name = forms.CharField(max_length=100, required=False)
realm_subdomain = forms.CharField(max_length=40, required=False)
+ realm_org_type = forms.ChoiceField(((Realm.COMMUNITY, 'Community'),
+ (Realm.CORPORATE, 'Corporate')), \
+ initial=Realm.COMMUNITY, required=False)
+
if settings.TERMS_OF_SERVICE:
terms = forms.BooleanField(required=True)
diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index 5e53f32406..9cd1d3f463 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -1942,13 +1942,35 @@ def do_change_stream_description(realm, stream_name, new_description):
value=new_description)
send_event(event, stream_user_ids(stream))
-def do_create_realm(domain, name, restricted_to_domain=True, subdomain=None):
- # type: (text_type, text_type, bool, Optional[text_type]) -> Tuple[Realm, bool]
+def get_realm_creation_defaults(org_type=None, restricted_to_domain=None, invite_required=None):
+ # type: (Optional[int], Optional[bool], Optional[bool]) -> Dict[text_type, Any]
+ if org_type is None:
+ org_type = Realm.CORPORATE
+ # not totally clear what the defaults should be if exactly one of
+ # restricted_to_domain or invite_required are set. Just doing the
+ # least complicated thing that works when both are unset.
+ if restricted_to_domain is None:
+ restricted_to_domain = (org_type == Realm.CORPORATE)
+ if invite_required is None:
+ invite_required = not (org_type == Realm.CORPORATE)
+ return {'org_type': org_type,
+ 'restricted_to_domain': restricted_to_domain,
+ 'invite_required': invite_required}
+
+def do_create_realm(domain, name, subdomain=None, restricted_to_domain=None,
+ invite_required=None, org_type=None):
+ # type: (text_type, text_type, Optional[text_type], Optional[bool], Optional[bool], Optional[int]) -> Tuple[Realm, bool]
realm = get_realm(domain)
created = not realm
if created:
- realm = Realm(domain=domain, name=name, subdomain=subdomain,
- restricted_to_domain=restricted_to_domain)
+ realm_params = get_realm_creation_defaults(org_type=org_type,
+ restricted_to_domain=restricted_to_domain,
+ invite_required=invite_required)
+ org_type = realm_params['org_type']
+ restricted_to_domain = realm_params['restricted_to_domain']
+ invite_required = realm_params['invite_required']
+ realm = Realm(domain=domain, name=name, org_type=org_type, subdomain=subdomain,
+ restricted_to_domain=restricted_to_domain, invite_required=invite_required)
realm.save()
# Create stream once Realm object has been saved
@@ -1970,7 +1992,9 @@ system-generated notifications.""" % (product_name, notifications_stream.name,)
# Log the event
log_event({"type": "realm_created",
"domain": domain,
- "restricted_to_domain": restricted_to_domain})
+ "restricted_to_domain": restricted_to_domain,
+ "invite_required": invite_required,
+ "org_type": org_type})
if settings.NEW_USER_BOT is not None:
signup_message = "Signups enabled"
diff --git a/zerver/lib/test_helpers.py b/zerver/lib/test_helpers.py
index 3141380cb8..6117ff5c98 100644
--- a/zerver/lib/test_helpers.py
+++ b/zerver/lib/test_helpers.py
@@ -385,8 +385,9 @@ class ZulipTestCase(TestCase):
return self.submit_reg_form_for_user(username, password, domain=domain)
def submit_reg_form_for_user(self, username, password, domain="zulip.com",
- realm_name=None, realm_subdomain=None, **kwargs):
- # type: (text_type, text_type, text_type, Optional[text_type], Optional[text_type], **Any) -> HttpResponse
+ realm_name=None, realm_subdomain=None,
+ realm_org_type=Realm.COMMUNITY, **kwargs):
+ # type: (text_type, text_type, text_type, Optional[text_type], Optional[text_type], int, **Any) -> HttpResponse
"""
Stage two of the two-step registration process.
@@ -400,6 +401,7 @@ class ZulipTestCase(TestCase):
'realm_name': realm_name,
'realm_subdomain': realm_subdomain,
'key': find_key_by_email(username + '@' + domain),
+ 'realm_org_type': realm_org_type,
'terms': True},
**kwargs)
diff --git a/zerver/management/commands/create_realm.py b/zerver/management/commands/create_realm.py
index 9e6d913990..2518c2ca35 100644
--- a/zerver/management/commands/create_realm.py
+++ b/zerver/management/commands/create_realm.py
@@ -6,7 +6,7 @@ from typing import Any
from django.conf import settings
from django.core.management.base import BaseCommand
-from zerver.lib.actions import do_create_realm, set_default_streams
+from zerver.lib.actions import Realm, do_create_realm, set_default_streams, get_realm_creation_defaults
from zerver.models import RealmAlias
if settings.ZILENCER_ENABLED:
@@ -21,11 +21,6 @@ class Command(BaseCommand):
Usage: python manage.py create_realm --domain=foo.com --name='Foo, Inc.'"""
option_list = BaseCommand.option_list + (
- make_option('-o', '--open-realm',
- dest='open_realm',
- action="store_true",
- default=False,
- help='Make this an open realm.'),
make_option('-d', '--domain',
dest='domain',
type='str',
@@ -34,6 +29,17 @@ Usage: python manage.py create_realm --domain=foo.com --name='Foo, Inc.'"""
dest='name',
type='str',
help='The user-visible name for the realm.'),
+ make_option('--corporate',
+ dest='org_type',
+ action="store_const",
+ const=Realm.CORPORATE,
+ help='Is a corporate org_type'),
+ make_option('--community',
+ dest='org_type',
+ action="store_const",
+ const=Realm.COMMUNITY,
+ default=None,
+ help='Is a community org_type. Is the default.'),
make_option('--deployment',
dest='deployment_id',
type='int',
@@ -60,26 +66,21 @@ Usage: python manage.py create_realm --domain=foo.com --name='Foo, Inc.'"""
def handle(self, *args, **options):
# type: (*Any, **Any) -> None
- if options["domain"] is None or options["name"] is None:
+ domain = options["domain"]
+ name = options["name"]
+
+ if domain is None or name is None:
print("\033[1;31mPlease provide both a domain and name.\033[0m\n", file=sys.stderr)
self.print_help("python manage.py", "create_realm")
exit(1)
- if options["open_realm"] and options["deployment_id"] is not None:
- print("\033[1;31mExternal deployments cannot be open realms.\033[0m\n", file=sys.stderr)
- self.print_help("python manage.py", "create_realm")
- exit(1)
if options["deployment_id"] is not None and not settings.ZILENCER_ENABLED:
print("\033[1;31mExternal deployments are not supported on voyager deployments.\033[0m\n", file=sys.stderr)
exit(1)
- domain = options["domain"]
- name = options["name"]
-
self.validate_domain(domain)
- realm, created = do_create_realm(
- domain, name, restricted_to_domain=not options["open_realm"])
+ realm, created = do_create_realm(domain, name, org_type=options["org_type"])
if created:
print(domain, "created.")
if options["deployment_id"] is not None:
diff --git a/zerver/migrations/0030_realm_org_type.py b/zerver/migrations/0030_realm_org_type.py
new file mode 100644
index 0000000000..d44f5431d2
--- /dev/null
+++ b/zerver/migrations/0030_realm_org_type.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('zerver', '0029_realm_subdomain'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='realm',
+ name='org_type',
+ field=models.PositiveSmallIntegerField(default=1),
+ ),
+ ]
diff --git a/zerver/models.py b/zerver/models.py
index 7d8c32699d..21f8913ef9 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -145,6 +145,11 @@ class Realm(ModelReprMixin, models.Model):
DEFAULT_MESSAGE_CONTENT_EDIT_LIMIT_SECONDS = 600 # if changed, also change in admin.js
message_content_edit_limit_seconds = models.IntegerField(default=DEFAULT_MESSAGE_CONTENT_EDIT_LIMIT_SECONDS) # type: int
+ # Valid org_types are {CORPORATE, COMMUNITY}
+ CORPORATE = 1
+ COMMUNITY = 2
+ org_type = models.PositiveSmallIntegerField(default=CORPORATE) # type: int
+
date_created = models.DateTimeField(default=timezone.now) # type: datetime.datetime
notifications_stream = models.ForeignKey('Stream', related_name='+', null=True, blank=True) # type: Optional[Stream]
deactivated = models.BooleanField(default=False) # type: bool
diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py
index 85ed92eb0b..8df0d2ceab 100644
--- a/zerver/tests/test_signup.py
+++ b/zerver/tests/test_signup.py
@@ -668,10 +668,11 @@ class RealmCreationTest(ZulipTestCase):
username = "user1"
password = "test"
domain = "test.com"
+ org_type = Realm.COMMUNITY
email = "user1@test.com"
# Make sure the realm does not exist
- self.assertIsNone(get_realm("test.com"))
+ self.assertIsNone(get_realm(domain))
with self.settings(OPEN_REALM_CREATION=True):
# Create new realm with the email
@@ -687,21 +688,49 @@ class RealmCreationTest(ZulipTestCase):
result = self.client_get(confirmation_url)
self.assertEquals(result.status_code, 200)
- result = self.submit_reg_form_for_user(username, password, domain)
+ result = self.submit_reg_form_for_user(username, password, domain=domain, realm_org_type=org_type)
self.assertEquals(result.status_code, 302)
# Make sure the realm is created
- realm = get_realm("test.com")
-
+ realm = get_realm(domain)
self.assertIsNotNone(realm)
self.assertEqual(realm.domain, domain)
self.assertEqual(get_user_profile_by_email(email).realm, realm)
+ # Check defaults
+ self.assertEquals(realm.org_type, Realm.COMMUNITY)
+ self.assertEquals(realm.restricted_to_domain, False)
+ self.assertEquals(realm.invite_required, True)
+
self.assertTrue(result["Location"].endswith("/invite/"))
result = self.client_get(result["Location"])
self.assert_in_response("You're the first one here!", result)
+ def test_realm_corporate_defaults(self):
+ # type: () -> None
+ username = "user1"
+ password = "test"
+ domain = "test.com"
+ org_type = Realm.CORPORATE
+ email = "user1@test.com"
+
+ # Make sure the realm does not exist
+ self.assertIsNone(get_realm(domain))
+
+ # Create new realm with the email
+ with self.settings(OPEN_REALM_CREATION=True):
+ self.client_post('/create_realm/', {'email': email})
+ confirmation_url = self.get_confirmation_url_from_outbox(email)
+ self.client_get(confirmation_url)
+ self.submit_reg_form_for_user(username, password, domain=domain, realm_org_type=org_type)
+
+ # Check corporate defaults were set correctly
+ realm = get_realm(domain)
+ self.assertEquals(realm.org_type, Realm.CORPORATE)
+ self.assertEquals(realm.restricted_to_domain, True)
+ self.assertEquals(realm.invite_required, False)
+
class UserSignUpTest(ZulipTestCase):
def test_user_default_language(self):
diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py
index 22b6ee7262..5a343244f3 100644
--- a/zerver/views/__init__.py
+++ b/zerver/views/__init__.py
@@ -198,11 +198,13 @@ def accounts_register(request):
if realm_creation:
domain = split_email_to_domain(email)
+ realm_name = form.cleaned_data['realm_name']
+ org_type = int(form.cleaned_data['realm_org_type'])
if settings.REALMS_HAVE_SUBDOMAINS:
- realm = do_create_realm(domain, form.cleaned_data['realm_name'],
+ realm = do_create_realm(domain, realm_name, org_type=org_type,
subdomain=form.cleaned_data['realm_subdomain'])[0]
else:
- realm = do_create_realm(domain, form.cleaned_data['realm_name'])[0]
+ realm = do_create_realm(domain, realm_name, org_type=org_type)[0]
set_default_streams(realm, settings.DEFAULT_NEW_REALM_STREAMS)