CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-18 21:04:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

home.py: move emojiset_choices to register_ret.

Browse Source 
Moving user_profile data to fetch_initial_state_data from #3853
This commit is contained in:
fionabunny 2017-04-26 14:49:40 -07:00 committed by Tim Abbott
parent 78bcbc79d6
commit 2bdb6a00a7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zerver/lib/events.py
View File

@ -159,6 +159,7 @@ def fetch_initial_state_data(user_profile, event_types, queue_id,
state['left_side_userlist'] = user_profile.left_side_userlist
state['emoji_alt_code'] = user_profile.emoji_alt_code
state['emojiset'] = user_profile.emojiset
state['emojiset_choices'] = user_profile.emojiset_choices()
state['timezone'] = user_profile.timezone
state['default_language'] = user_profile.default_language

2
zerver/views/home.py
View File

@ -223,7 +223,6 @@ def home_real(request):
avatar_source = user_profile.avatar_source,
timezone = user_profile.timezone,
emojiset = user_profile.emojiset,
emojiset_choices = user_profile.emojiset_choices(),
# Stream message notification settings:
stream_desktop_notifications_enabled = user_profile.enable_stream_desktop_notifications,
@ -266,6 +265,7 @@ def home_real(request):
'attachments',
'default_language',
'emoji_alt_code',
'emojiset_choices',
'hotspots',
'last_event_id',
'left_side_userlist',