Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

page_params: scope presence_disabled in realm.

This commit is contained in:
Tim Abbott 2017-02-28 14:34:14 -08:00
parent dfb7a57bec
commit e86ed89986
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/activity.js
View File

@ -278,7 +278,7 @@ function info_for(user_id) {
} }
exports.update_users = function (updated_users) { exports.update_users = function (updated_users) {
if (page_params.presence_disabled) { if (page_params.realm_presence_disabled) {
return; return;
} }
@ -310,7 +310,7 @@ exports.update_users = function (updated_users) {
}; };
exports.build_user_sidebar = function () { exports.build_user_sidebar = function () {
if (page_params.presence_disabled) { if (page_params.realm_presence_disabled) {
return; return;
} }
@ -343,7 +343,7 @@ function hide_huddles() {
} }
exports.update_huddles = function () { exports.update_huddles = function () {
if (page_params.presence_disabled) { if (page_params.realm_presence_disabled) {
return; return;
} }

2
static/js/ui.js
View File

@ -570,7 +570,7 @@ $(function () {
$("#edit-message-hotkey-help").hide(); $("#edit-message-hotkey-help").hide();
} }
if (page_params.presence_disabled) { if (page_params.realm_presence_disabled) {
$("#user-list").hide(); $("#user-list").hide();
$("#group-pm-list").hide(); $("#group-pm-list").hide();
} }

2
zerver/tests/tests.py
View File

@ -1988,7 +1988,6 @@ class HomeTest(ZulipTestCase):
"people_list", "people_list",
"pm_content_in_desktop_notifications", "pm_content_in_desktop_notifications",
"poll_timeout", "poll_timeout",
"presence_disabled",
"product_name", "product_name",
"prompt_for_invites", "prompt_for_invites",
"realm_add_emoji_by_admins_only", "realm_add_emoji_by_admins_only",
@ -2005,6 +2004,7 @@ class HomeTest(ZulipTestCase):
"realm_invite_required", "realm_invite_required",
"realm_message_content_edit_limit_seconds", "realm_message_content_edit_limit_seconds",
"realm_name", "realm_name",
"realm_presence_disabled",
"realm_restricted_to_domain", "realm_restricted_to_domain",
"realm_uri", "realm_uri",
"realm_waiting_period_threshold", "realm_waiting_period_threshold",

2
zerver/views/home.py
View File

@ -260,7 +260,7 @@ def home_real(request):
avatar_source = user_profile.avatar_source, avatar_source = user_profile.avatar_source,
mandatory_topics = user_profile.realm.mandatory_topics, mandatory_topics = user_profile.realm.mandatory_topics,
show_digest_email = user_profile.realm.show_digest_email, show_digest_email = user_profile.realm.show_digest_email,
presence_disabled = user_profile.realm.presence_disabled, realm_presence_disabled = user_profile.realm.presence_disabled,
is_zephyr_mirror_realm = user_profile.realm.is_zephyr_mirror_realm, is_zephyr_mirror_realm = user_profile.realm.is_zephyr_mirror_realm,
) )