diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 1aae6b5825..8626c353c2 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -1237,6 +1237,10 @@ def set_default_streams(realm, stream_names): notifications_stream, _ = create_stream_if_needed(realm, Realm.NOTIFICATION_STREAM_NAME) DefaultStream.objects.create(stream=notifications_stream, realm=realm) + log_event({'type': 'default_streams', + 'domain': realm.domain, + 'streams': stream_names}) + def get_default_subs(user_profile): return [default.stream for default in DefaultStream.objects.select_related("stream", "stream__realm").filter(realm=user_profile.realm)] diff --git a/zerver/management/commands/create_realm.py b/zerver/management/commands/create_realm.py index 71ee4215eb..cb9eefee62 100644 --- a/zerver/management/commands/create_realm.py +++ b/zerver/management/commands/create_realm.py @@ -3,7 +3,7 @@ from optparse import make_option from django.conf import settings from django.core.management.base import BaseCommand -from zerver.lib.actions import do_create_realm +from zerver.lib.actions import do_create_realm, set_default_streams from zerver.models import RealmAlias if not settings.ENTERPRISE: @@ -85,6 +85,8 @@ Usage: python manage.py create_realm --domain=foo.com --name='Foo, Inc.'""" deployment = Deployment.objects.get(base_site_url="https://zulip.com/") deployment.realms.add(realm) deployment.save() - print "\033[1;36mDon't forget to run set_default_streams!\033[0m" + set_default_streams(realm, ["social", "engineering"]) + + print "\033[1;36mDefault streams set to social,engineering,zulip!\033[0m" else: print domain, "already exists." diff --git a/zerver/management/commands/set_default_streams.py b/zerver/management/commands/set_default_streams.py index e53022831e..0405cf448a 100644 --- a/zerver/management/commands/set_default_streams.py +++ b/zerver/management/commands/set_default_streams.py @@ -3,7 +3,7 @@ from __future__ import absolute_import from django.core.management.base import BaseCommand from zerver.models import Realm -from zerver.lib.actions import set_default_streams, log_event +from zerver.lib.actions import set_default_streams from optparse import make_option import sys @@ -43,7 +43,3 @@ set of streams (which can be empty, with `--streams=`)." stream_names = [stream.strip() for stream in options["streams"].split(",")] realm = Realm.objects.get(domain=options["domain"]) set_default_streams(realm, stream_names) - - log_event({'type': 'default_streams', - 'domain': realm.domain, - 'streams': stream_names})