paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 19:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

home.py: move show_digest_email as realm_show_digest_email.

Browse Source 
Part of #3853.
This commit is contained in:
fionabunny
2017-04-19 22:59:03 -07:00
committed by Tim Abbott
parent 64041e0da1
commit 935ddf3b17
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/settings_notifications.js
View File

@@ -5,7 +5,7 @@ var exports = {};
exports.set_up = function () { exports.set_up = function () {
$("#notify-settings-status").hide(); $("#notify-settings-status").hide();
if (!page_params.show_digest_email) { if (!page_params.realm_show_digest_email) {
$("#other_notifications").hide(); $("#other_notifications").hide();
} }

1
zerver/lib/events.py
View File

@@ -113,6 +113,7 @@ def fetch_initial_state_data(user_profile, event_types, queue_id,
state['realm_uri'] = user_profile.realm.uri state['realm_uri'] = user_profile.realm.uri
state['realm_presence_disabled'] = user_profile.realm.presence_disabled state['realm_presence_disabled'] = user_profile.realm.presence_disabled
state['realm_mandatory_topics'] = user_profile.realm.mandatory_topics state['realm_mandatory_topics'] = user_profile.realm.mandatory_topics
state['realm_show_digest_email'] = user_profile.realm.show_digest_email
if want('realm_domains'): if want('realm_domains'):
state['realm_domains'] = get_realm_domains(user_profile.realm) state['realm_domains'] = get_realm_domains(user_profile.realm)

2
zerver/tests/test_home.py
View File

@@ -122,6 +122,7 @@ class HomeTest(ZulipTestCase):
"realm_name_changes_disabled", "realm_name_changes_disabled",
"realm_presence_disabled", "realm_presence_disabled",
"realm_restricted_to_domain", "realm_restricted_to_domain",
"realm_show_digest_email",
"realm_uri", "realm_uri",
"realm_waiting_period_threshold", "realm_waiting_period_threshold",
"referrals", "referrals",
@@ -131,7 +132,6 @@ class HomeTest(ZulipTestCase):
"server_inline_url_embed_preview", "server_inline_url_embed_preview",
"server_uri", "server_uri",
"share_the_love", "share_the_love",
"show_digest_email",
"sounds_enabled", "sounds_enabled",
"stream_desktop_notifications_enabled", "stream_desktop_notifications_enabled",
"stream_sounds_enabled", "stream_sounds_enabled",

2
zerver/views/home.py
View File

@@ -213,7 +213,6 @@ def home_real(request):
# TODO: Move all of these data to register_ret and pull from there # TODO: Move all of these data to register_ret and pull from there
password_auth_enabled = password_auth_enabled(user_profile.realm), password_auth_enabled = password_auth_enabled(user_profile.realm),
name_changes_disabled = name_changes_disabled(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, is_zephyr_mirror_realm = user_profile.realm.is_zephyr_mirror_realm,
# user_profile data. # user_profile data.
@@ -312,6 +311,7 @@ def home_real(request):
'realm_name_changes_disabled', 'realm_name_changes_disabled',
'realm_presence_disabled', 'realm_presence_disabled',
'realm_restricted_to_domain', 'realm_restricted_to_domain',
'realm_show_digest_email',
'realm_uri', 'realm_uri',
'realm_waiting_period_threshold', 'realm_waiting_period_threshold',
'referrals', 'referrals',