diff --git a/static/js/activity.js b/static/js/activity.js index b895463ba2..51e5e6efc6 100644 --- a/static/js/activity.js +++ b/static/js/activity.js @@ -278,7 +278,7 @@ function info_for(user_id) { } exports.update_users = function (updated_users) { - if (page_params.presence_disabled) { + if (page_params.realm_presence_disabled) { return; } @@ -310,7 +310,7 @@ exports.update_users = function (updated_users) { }; exports.build_user_sidebar = function () { - if (page_params.presence_disabled) { + if (page_params.realm_presence_disabled) { return; } @@ -343,7 +343,7 @@ function hide_huddles() { } exports.update_huddles = function () { - if (page_params.presence_disabled) { + if (page_params.realm_presence_disabled) { return; } diff --git a/static/js/ui.js b/static/js/ui.js index 713a76befe..14e56e7299 100644 --- a/static/js/ui.js +++ b/static/js/ui.js @@ -570,7 +570,7 @@ $(function () { $("#edit-message-hotkey-help").hide(); } - if (page_params.presence_disabled) { + if (page_params.realm_presence_disabled) { $("#user-list").hide(); $("#group-pm-list").hide(); } diff --git a/zerver/tests/tests.py b/zerver/tests/tests.py index 43978f8c45..10b9ffd6dc 100644 --- a/zerver/tests/tests.py +++ b/zerver/tests/tests.py @@ -1988,7 +1988,6 @@ class HomeTest(ZulipTestCase): "people_list", "pm_content_in_desktop_notifications", "poll_timeout", - "presence_disabled", "product_name", "prompt_for_invites", "realm_add_emoji_by_admins_only", @@ -2005,6 +2004,7 @@ class HomeTest(ZulipTestCase): "realm_invite_required", "realm_message_content_edit_limit_seconds", "realm_name", + "realm_presence_disabled", "realm_restricted_to_domain", "realm_uri", "realm_waiting_period_threshold", diff --git a/zerver/views/home.py b/zerver/views/home.py index 1efe63141b..52e93ea7ca 100644 --- a/zerver/views/home.py +++ b/zerver/views/home.py @@ -260,7 +260,7 @@ def home_real(request): avatar_source = user_profile.avatar_source, mandatory_topics = user_profile.realm.mandatory_topics, 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, )