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

Preserve muting preferences across reloads.

Browse Source 
We have been persisting muting preferences on the back end for
a while, but we haven't been adding them to page_params for the
client to have at reload/startup time.

(imported from commit d9ca68aa0e4d22bfb0e6ce67fc0bc63981175c8b)
This commit is contained in:
Steve Howell
2013-09-27 13:38:56 -04:00
parent c79e3a95b1
commit 49232d9173
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/muting_ui.js
View File

@@ -45,6 +45,10 @@ exports.handle_updates = function (muted_topics) {
exports.rerender(); exports.rerender();
}; };
$(function () {
muting.set_muted_topics(page_params.muted_topics);
});
return exports; return exports;
}()); }());

2
zerver/lib/actions.py
View File

@@ -1529,6 +1529,8 @@ def do_events_register(user_profile, user_client, apply_markdown=True,
ret['realm_emoji'] = user_profile.realm.get_emoji() ret['realm_emoji'] = user_profile.realm.get_emoji()
if event_types is None or "alert_words" in event_types: if event_types is None or "alert_words" in event_types:
ret['alert_words'] = user_alert_words(user_profile) ret['alert_words'] = user_alert_words(user_profile)
if event_types is None or "muted_topics" in event_types:
ret['muted_topics'] = ujson.loads(user_profile.muted_topics)
# Apply events that came in while we were fetching initial data # Apply events that came in while we were fetching initial data
events = get_user_events(user_profile, queue_id, -1) events = get_user_events(user_profile, queue_id, -1)

1
zerver/views/__init__.py
View File

@@ -708,6 +708,7 @@ def home(request):
onboarding_steps = ujson.loads(user_profile.onboarding_steps), onboarding_steps = ujson.loads(user_profile.onboarding_steps),
staging = settings.STAGING_DEPLOYED or not settings.DEPLOYED, staging = settings.STAGING_DEPLOYED or not settings.DEPLOYED,
alert_words = register_ret['alert_words'], alert_words = register_ret['alert_words'],
muted_topics = register_ret['muted_topics'],
show_admin = user_profile.show_admin, show_admin = user_profile.show_admin,
notify_for_streams_by_default = notify_for_streams_by_default(user_profile) notify_for_streams_by_default = notify_for_streams_by_default(user_profile)
)) ))