paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-24 16:43:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

populate_db: Make invite_only default to False.

Browse Source 
Explicit mentions of `invite_only` as False in the stream dict to be
passed to `bulk_create_streams` have been removed.
This commit is contained in:
Shubham Padia
2018-05-17 01:04:43 +05:30
committed by Tim Abbott
parent 7b4f6e0058
commit 315047a38b
2 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/bulk_create.py
View File

@@ -68,14 +68,14 @@ def bulk_create_streams(realm: Realm,
for name, options in stream_dict.items():
if 'history_public_to_subscribers' not in options:
options['history_public_to_subscribers'] = (
not options["invite_only"] and not realm.is_zephyr_mirror_realm)
not options.get("invite_only", False) and not realm.is_zephyr_mirror_realm)
if name.lower() not in existing_streams:
streams_to_create.append(
Stream(
realm=realm,
name=name,
description=options["description"],
invite_only=options["invite_only"],
invite_only=options.get("invite_only", False),
is_announcement_only=options.get("is_announcement_only", False),
history_public_to_subscribers=options["history_public_to_subscribers"],
is_web_public=options["is_web_public"],

42
zilencer/management/commands/populate_db.py
View File

@@ -219,16 +219,11 @@ class Command(BaseCommand):
# Create public streams.
stream_list = ["Verona", "Denmark", "Scotland", "Venice", "Rome"]
stream_dict = {
"Verona": {"description": "A city in Italy",
"invite_only": False, "is_web_public": False},
"Denmark": {"description": "A Scandinavian country",
"invite_only": False, "is_web_public": False},
"Scotland": {"description": "Located in the United Kingdom",
"invite_only": False, "is_web_public": False},
"Venice": {"description": "A northeastern Italian city",
"invite_only": False, "is_web_public": False},
"Rome": {"description": "Yet another Italian city",
"invite_only": False, "is_web_public": True}
"Verona": {"description": "A city in Italy", "is_web_public": False},
"Denmark": {"description": "A Scandinavian country", "is_web_public": False},
"Scotland": {"description": "Located in the United Kingdom", "is_web_public": False},
"Venice": {"description": "A northeastern Italian city", "is_web_public": False},
"Rome": {"description": "Yet another Italian city", "is_web_public": True}
} # type: Dict[str, Dict[str, Any]]
bulk_create_streams(zulip_realm, stream_dict)
@@ -396,24 +391,16 @@ class Command(BaseCommand):
# when running populate_db for the test suite
zulip_stream_dict = {
"devel": {"description": "For developing",
"invite_only": False, "is_web_public": False},
"all": {"description": "For everything",
"invite_only": False, "is_web_public": False},
"devel": {"description": "For developing", "is_web_public": False},
"all": {"description": "For everything", "is_web_public": False},
"announce": {"description": "For announcements",
"invite_only": False, 'is_announcement_only': True, "is_web_public": False},
"design": {"description": "For design",
"invite_only": False, "is_web_public": False},
"support": {"description": "For support",
"invite_only": False, "is_web_public": False},
"social": {"description": "For socializing",
"invite_only": False, "is_web_public": False},
"test": {"description": "For testing",
"invite_only": False, "is_web_public": False},
"errors": {"description": "For errors",
"invite_only": False, "is_web_public": False},
"sales": {"description": "For sales discussion",
"invite_only": False, "is_web_public": False}
'is_announcement_only': True, "is_web_public": False},
"design": {"description": "For design", "is_web_public": False},
"support": {"description": "For support", "is_web_public": False},
"social": {"description": "For socializing", "is_web_public": False},
"test": {"description": "For testing", "is_web_public": False},
"errors": {"description": "For errors", "is_web_public": False},
"sales": {"description": "For sales discussion", "is_web_public": False}
} # type: Dict[str, Dict[str, Any]]
# Calculate the maximum number of digits in any extra stream's
@@ -430,7 +417,6 @@ class Command(BaseCommand):
zulip_stream_dict[extra_stream_name] = {
"description": "Auto-generated extra stream.",
"invite_only": False,
"is_web_public": False,
}