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

home.py: move autoscroll_forever to register_ret.

Browse Source 
Move the user_profile data section down into fetch_initial_state_data so
it entirely pulls from register_ret for #3853
This commit is contained in:
fionabunny
2017-04-26 15:16:24 -07:00
committed by Tim Abbott
parent 22be291d96
commit 379a8afaae
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zerver/lib/events.py
View File

@@ -165,6 +165,7 @@ def fetch_initial_state_data(user_profile, event_types, queue_id,
state['emojiset_choices'] = user_profile.emojiset_choices() state['emojiset_choices'] = user_profile.emojiset_choices()
state['timezone'] = user_profile.timezone state['timezone'] = user_profile.timezone
state['default_language'] = user_profile.default_language state['default_language'] = user_profile.default_language
state['autoscroll_forever'] = user_profile.autoscroll_forever
if want('update_global_notifications'): if want('update_global_notifications'):
state['default_desktop_notifications'] = user_profile.default_desktop_notifications state['default_desktop_notifications'] = user_profile.default_desktop_notifications

2
zerver/views/home.py
View File

@@ -212,7 +212,6 @@ def home_real(request):
user_id = user_profile.id, user_id = user_profile.id,
is_admin = user_profile.is_realm_admin, is_admin = user_profile.is_realm_admin,
can_create_streams = user_profile.can_create_streams(), can_create_streams = user_profile.can_create_streams(),
autoscroll_forever = user_profile.autoscroll_forever,
# 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.
@@ -240,6 +239,7 @@ def home_real(request):
page_params_core_fields = [ page_params_core_fields = [
'alert_words', 'alert_words',
'attachments', 'attachments',
'autoscroll_forever',
'avatar_source', 'avatar_source',
'avatar_url', 'avatar_url',
'avatar_url_medium', 'avatar_url_medium',