paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

home.py: rename subbed_info and move to register_ret.

Browse Source
This commit is contained in:
fionabunny
2017-04-20 22:43:51 -07:00
committed by Tim Abbott
parent b7c6d46bf9
commit 26d080cf64
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/stream_data.js
View File

@@ -388,12 +388,12 @@ exports.initialize_from_page_params = function () {
defaults[stream.name] = true; defaults[stream.name] = true;
}); });
populate_subscriptions(page_params.subbed_info, true); populate_subscriptions(page_params.subscriptions, true);
populate_subscriptions(page_params.unsubbed_info, false); populate_subscriptions(page_params.unsubbed_info, false);
populate_subscriptions(page_params.neversubbed_info, false); populate_subscriptions(page_params.neversubbed_info, false);
// Garbage collect data structures that were only used for initialization. // Garbage collect data structures that were only used for initialization.
delete page_params.subbed_info; delete page_params.subscriptions;
delete page_params.unsubbed_info; delete page_params.unsubbed_info;
delete page_params.neversubbed_info; delete page_params.neversubbed_info;
}; };

2
zerver/tests/test_home.py
View File

@@ -134,7 +134,7 @@ class HomeTest(ZulipTestCase):
"sounds_enabled", "sounds_enabled",
"stream_desktop_notifications_enabled", "stream_desktop_notifications_enabled",
"stream_sounds_enabled", "stream_sounds_enabled",
"subbed_info", "subscriptions",
"test_suite", "test_suite",
"timezone", "timezone",
"twenty_four_hour_time", "twenty_four_hour_time",

2
zerver/views/home.py
View File

@@ -240,7 +240,6 @@ def home_real(request):
# Realm foreign key data from register_ret. # Realm foreign key data from register_ret.
# TODO: Rename these to match register_ret values. # TODO: Rename these to match register_ret values.
subbed_info = register_ret['subscriptions'],
unsubbed_info = register_ret['unsubscribed'], unsubbed_info = register_ret['unsubscribed'],
neversubbed_info = register_ret['never_subscribed'], neversubbed_info = register_ret['never_subscribed'],
people_list = register_ret['realm_users'], people_list = register_ret['realm_users'],
@@ -310,6 +309,7 @@ def home_real(request):
'realm_uri', 'realm_uri',
'realm_waiting_period_threshold', 'realm_waiting_period_threshold',
'referrals', 'referrals',
'subscriptions',
'twenty_four_hour_time', 'twenty_four_hour_time',
'zulip_version', 'zulip_version',
] ]