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

settings: Fix setting JITSI_SERVER_URL to None.

Browse Source 
This fixes a bug introduced in
55a23754c3, that resulted in Zulip
crashing on startup if JITSI_SERVER_URL=None.

Fixes #18512.
This commit is contained in:
Tim Abbott
2021-05-18 19:05:04 -07:00
parent ce96018af4
commit 2f9d4f5a96
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/events.py
View File

@@ -235,7 +235,6 @@ def fetch_initial_state_data(
state["zulip_plan_is_not_limited"] = realm.plan_type != Realm.LIMITED
state["upgrade_text_for_wide_organization_logo"] = str(Realm.UPGRADE_TEXT_STANDARD)
state["realm_default_external_accounts"] = DEFAULT_EXTERNAL_ACCOUNTS
state["jitsi_server_url"] = settings.JITSI_SERVER_URL.rstrip("/")
state["development_environment"] = settings.DEVELOPMENT
state["server_generation"] = settings.SERVER_GENERATION
state["password_min_length"] = settings.PASSWORD_MIN_LENGTH
@@ -248,6 +247,11 @@ def fetch_initial_state_data(
state["server_name_changes_disabled"] = settings.NAME_CHANGES_DISABLED
state["giphy_rating_options"] = realm.GIPHY_RATING_OPTIONS
if settings.JITSI_SERVER_URL is not None:
state["jitsi_server_url"] = settings.JITSI_SERVER_URL.rstrip("/")
else: # nocoverage
state["jitsi_server_url"] = None
if realm.notifications_stream and not realm.notifications_stream.deactivated:
notifications_stream = realm.notifications_stream
state["realm_notifications_stream_id"] = notifications_stream.id