From 0aaa55fb8f0c140b9d93630281a626579bc44525 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Mon, 18 Jul 2016 21:31:33 -0700 Subject: [PATCH] settings: Extract settings.SHARE_THE_LOVE. --- static/js/feature_flags.js | 3 --- static/js/referral.js | 2 +- zerver/tests/tests.py | 2 +- zerver/views/__init__.py | 2 +- zproject/local_settings.py | 1 + zproject/settings.py | 1 + 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/static/js/feature_flags.js b/static/js/feature_flags.js index 07b798e5d2..1f3c7ed7b6 100644 --- a/static/js/feature_flags.js +++ b/static/js/feature_flags.js @@ -2,9 +2,6 @@ var feature_flags = (function () { var exports = {}; -// Voyager-related flags -exports.do_not_share_the_love = page_params.voyager; - // Manually-flipped debugging flags exports.log_send_times = false; exports.collect_send_times = false; diff --git a/static/js/referral.js b/static/js/referral.js index f363dbca4b..c42a195aea 100644 --- a/static/js/referral.js +++ b/static/js/referral.js @@ -20,7 +20,7 @@ exports.update_state = function (granted, used) { last_granted = granted; last_used = used; - if (granted <= 0 || feature_flags.do_not_share_the_love) { + if (granted <= 0 || !page_params.share_the_love) { $("#share-the-love").hide(); } else { $("#referral-form input").attr('placeholder', _.shuffle(placeholder_invitees).pop()); diff --git a/zerver/tests/tests.py b/zerver/tests/tests.py index dd12e1bb55..c95d8b2762 100644 --- a/zerver/tests/tests.py +++ b/zerver/tests/tests.py @@ -1798,6 +1798,7 @@ class HomeTest(AuthedTestCase): "realm_name", "realm_restricted_to_domain", "referrals", + "share_the_love", "show_digest_email", "sounds_enabled", "staging", @@ -1808,7 +1809,6 @@ class HomeTest(AuthedTestCase): "twenty_four_hour_time", "unread_count", "unsubbed_info", - "voyager", ] email = "hamlet@zulip.com" diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index 5752b243a0..24f5e604f4 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -924,7 +924,7 @@ def home(request): # Pass parameters to the client-side JavaScript code. # These end up in a global JavaScript Object named 'page_params'. page_params = dict( - voyager = settings.VOYAGER, + share_the_love = settings.SHARE_THE_LOVE, development_environment = settings.DEVELOPMENT, debug_mode = settings.DEBUG, test_suite = settings.TEST_SUITE, diff --git a/zproject/local_settings.py b/zproject/local_settings.py index 22e00a20f5..e12abd9d1b 100644 --- a/zproject/local_settings.py +++ b/zproject/local_settings.py @@ -28,6 +28,7 @@ if not ZULIP_COM: raise Exception("You should create your own local settings from local_settings_template.") ZULIP_FRIENDS_LIST_ID = '84b2f3da6b' +SHARE_THE_LOVE = True # This can be filled in automatically from the database, maybe DEPLOYMENT_ROLE_NAME = 'zulip.com' diff --git a/zproject/settings.py b/zproject/settings.py index ab634a7645..6f35a22881 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -134,6 +134,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '', 'FEEDBACK_BOT': 'feedback@zulip.com', 'FEEDBACK_BOT_NAME': 'Zulip Feedback Bot', 'ADMINS': '', + 'SHARE_THE_LOVE': False, 'INLINE_IMAGE_PREVIEW': True, 'CAMO_URI': '', 'ENABLE_FEEDBACK': PRODUCTION,