diff --git a/static/js/settings_notifications.js b/static/js/settings_notifications.js index f0f0ac91c9..630b9535ea 100644 --- a/static/js/settings_notifications.js +++ b/static/js/settings_notifications.js @@ -5,7 +5,7 @@ var exports = {}; exports.set_up = function () { $("#notify-settings-status").hide(); - if (!page_params.show_digest_email) { + if (!page_params.realm_show_digest_email) { $("#other_notifications").hide(); } diff --git a/zerver/lib/events.py b/zerver/lib/events.py index 3ec7872426..412e10fde4 100644 --- a/zerver/lib/events.py +++ b/zerver/lib/events.py @@ -113,6 +113,7 @@ def fetch_initial_state_data(user_profile, event_types, queue_id, state['realm_uri'] = user_profile.realm.uri state['realm_presence_disabled'] = user_profile.realm.presence_disabled state['realm_mandatory_topics'] = user_profile.realm.mandatory_topics + state['realm_show_digest_email'] = user_profile.realm.show_digest_email if want('realm_domains'): state['realm_domains'] = get_realm_domains(user_profile.realm) diff --git a/zerver/tests/test_home.py b/zerver/tests/test_home.py index 208d91c1cf..d15ead4bed 100644 --- a/zerver/tests/test_home.py +++ b/zerver/tests/test_home.py @@ -122,6 +122,7 @@ class HomeTest(ZulipTestCase): "realm_name_changes_disabled", "realm_presence_disabled", "realm_restricted_to_domain", + "realm_show_digest_email", "realm_uri", "realm_waiting_period_threshold", "referrals", @@ -131,7 +132,6 @@ class HomeTest(ZulipTestCase): "server_inline_url_embed_preview", "server_uri", "share_the_love", - "show_digest_email", "sounds_enabled", "stream_desktop_notifications_enabled", "stream_sounds_enabled", diff --git a/zerver/views/home.py b/zerver/views/home.py index 5e3f29589b..9d89291eb9 100644 --- a/zerver/views/home.py +++ b/zerver/views/home.py @@ -213,7 +213,6 @@ def home_real(request): # TODO: Move all of these data to register_ret and pull from there password_auth_enabled = password_auth_enabled(user_profile.realm), name_changes_disabled = name_changes_disabled(user_profile.realm), - show_digest_email = user_profile.realm.show_digest_email, is_zephyr_mirror_realm = user_profile.realm.is_zephyr_mirror_realm, # user_profile data. @@ -312,6 +311,7 @@ def home_real(request): 'realm_name_changes_disabled', 'realm_presence_disabled', 'realm_restricted_to_domain', + 'realm_show_digest_email', 'realm_uri', 'realm_waiting_period_threshold', 'referrals',