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

Rename page_params.stream_list to page_params.subbed_info.

Browse Source 
This matches page_params.unsubbed_info, plus it sets up to
add something like page_params.stream_dict without being confusing.

(imported from commit 2d40deb779e5c7a488d6952560b4119094bbc0d8)
This commit is contained in:
Steve Howell
2014-01-23 15:04:46 -05:00
parent ee0f569c59
commit b82ed52e7b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/subs.js
View File

@@ -618,11 +618,11 @@ function inline_emails_into_subscriber_list(subs, email_dict) {
$(function () { $(function () {
var i; var i;
inline_emails_into_subscriber_list(page_params.stream_list, page_params.email_dict); inline_emails_into_subscriber_list(page_params.subbed_info, page_params.email_dict);
inline_emails_into_subscriber_list(page_params.unsubbed_info, page_params.email_dict); inline_emails_into_subscriber_list(page_params.unsubbed_info, page_params.email_dict);
// Populate stream_info with data handed over to client-side template. // Populate stream_info with data handed over to client-side template.
populate_subscriptions(page_params.stream_list, true); populate_subscriptions(page_params.subbed_info, true);
populate_subscriptions(page_params.unsubbed_info, false); populate_subscriptions(page_params.unsubbed_info, false);
$("#subscriptions_table").on("submit", "#add_new_subscription", function (e) { $("#subscriptions_table").on("submit", "#add_new_subscription", function (e) {

2
zerver/views/__init__.py
View File

@@ -832,7 +832,7 @@ def home(request):
login_page = settings.HOME_NOT_LOGGED_IN, login_page = settings.HOME_NOT_LOGGED_IN,
password_auth_enabled = password_auth_enabled(), password_auth_enabled = password_auth_enabled(),
have_initial_messages = user_has_messages, have_initial_messages = user_has_messages,
stream_list = register_ret['subscriptions'], subbed_info = register_ret['subscriptions'],
unsubbed_info = register_ret['unsubscribed'], unsubbed_info = register_ret['unsubscribed'],
email_dict = register_ret['email_dict'], email_dict = register_ret['email_dict'],
people_list = register_ret['realm_users'], people_list = register_ret['realm_users'],