paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

populate_db: Add a web public stream to dev database.

Browse Source 
We flip the Stream "Rome" to be a web public stream. Also we add
attribute is_web_public in various stream dicts and in the
bulk_create_streams function of bulk_create.py responsible for
default stream creation in dev environment.
This commit is contained in:
Aditya Bansal
2018-05-02 12:32:14 +05:30
committed by Tim Abbott
parent 1f358954be
commit 9629be689b
3 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
version.py
View File

@@ -8,4 +8,4 @@ ZULIP_VERSION = "1.8.0+git"
# Typically, adding a dependency only requires a minor version bump, and # Typically, adding a dependency only requires a minor version bump, and
# removing a dependency requires a major version bump. # removing a dependency requires a major version bump.
PROVISION_VERSION = '19.4' PROVISION_VERSION = '19.5'

1
zerver/lib/bulk_create.py
View File

@@ -76,6 +76,7 @@ def bulk_create_streams(realm: Realm,
description=options["description"], description=options["description"],
invite_only=options["invite_only"], invite_only=options["invite_only"],
history_public_to_subscribers=options["history_public_to_subscribers"], history_public_to_subscribers=options["history_public_to_subscribers"],
is_web_public=options["is_web_public"],
is_in_zephyr_realm=realm.is_zephyr_mirror_realm, is_in_zephyr_realm=realm.is_zephyr_mirror_realm,
) )
) )

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

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