paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 17:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

home.py: move initial_presences as presenses to register_ret.

Browse Source 
Simplify the page_params generation logic #3853.
This commit is contained in:
fionabunny
2017-04-24 12:23:50 -07:00
committed by Tim Abbott
parent 84c4d67916
commit 453fc06686
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
static/js/activity.js
View File

@@ -417,8 +417,9 @@ exports.initialize = function () {
onActive: focus_gained, onActive: focus_gained,
keepTracking: true}); keepTracking: true});
presence.set_info(page_params.initial_presences, presence.set_info(page_params.presences,
page_params.initial_servertime); page_params.initial_servertime);
exports.build_user_sidebar(); exports.build_user_sidebar();
exports.update_huddles(); exports.update_huddles();

2
zerver/tests/test_home.py
View File

@@ -71,7 +71,6 @@ class HomeTest(ZulipTestCase):
"have_initial_messages", "have_initial_messages",
"hotspots", "hotspots",
"initial_pointer", "initial_pointer",
"initial_presences",
"initial_servertime", "initial_servertime",
"is_admin", "is_admin",
"language_list", "language_list",
@@ -92,6 +91,7 @@ class HomeTest(ZulipTestCase):
"people_list", "people_list",
"pm_content_in_desktop_notifications", "pm_content_in_desktop_notifications",
"poll_timeout", "poll_timeout",
"presences",
"prompt_for_invites", "prompt_for_invites",
"realm_add_emoji_by_admins_only", "realm_add_emoji_by_admins_only",
"realm_allow_message_editing", "realm_allow_message_editing",

2
zerver/views/home.py
View File

@@ -242,7 +242,6 @@ def home_real(request):
# TODO: Rename these to match register_ret values. # TODO: Rename these to match register_ret values.
people_list = register_ret['realm_users'], people_list = register_ret['realm_users'],
initial_pointer = register_ret['pointer'], initial_pointer = register_ret['pointer'],
initial_presences = register_ret['presences'],
event_queue_id = register_ret['queue_id'], event_queue_id = register_ret['queue_id'],
# Misc. extra data. # Misc. extra data.
@@ -276,6 +275,7 @@ def home_real(request):
'max_message_id', 'max_message_id',
'muted_topics', 'muted_topics',
'never_subscribed', 'never_subscribed',
'presences',
'realm_add_emoji_by_admins_only', 'realm_add_emoji_by_admins_only',
'realm_allow_message_editing', 'realm_allow_message_editing',
'realm_authentication_methods', 'realm_authentication_methods',