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

home: Get page_params.enable_desktop_notifications from register_ret.

Browse Source
This commit is contained in:
Tim Abbott
2017-04-28 23:13:47 -07:00
parent c4eeb13353
commit df8f4a837c
7 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/views/home.py
View File

@@ -172,10 +172,6 @@ def home_real(request):
logging.warning("%s has invalid pointer %s" % (user_profile.email, user_profile.pointer))
latest_read = None
desktop_notifications_enabled = user_profile.enable_desktop_notifications
if narrow_stream is not None:
desktop_notifications_enabled = False
if user_profile.realm.notifications_stream:
notifications_stream = user_profile.realm.notifications_stream.name
else:
@@ -219,9 +215,6 @@ def home_real(request):
autoscroll_forever = user_profile.autoscroll_forever,
default_desktop_notifications = user_profile.default_desktop_notifications,
# Private message and @-mention notification settings:
desktop_notifications_enabled = desktop_notifications_enabled,
# Realm foreign key data from register_ret.
# TODO: Rename these to match register_ret values.
initial_pointer = register_ret['pointer'],
@@ -255,6 +248,7 @@ def home_real(request):
'emoji_alt_code',
'emojiset',
'emojiset_choices',
'enable_desktop_notifications',
'enable_digest_emails',
'enable_offline_email_notifications',
'enable_offline_push_notifications',
@@ -329,6 +323,7 @@ def home_real(request):
page_params["max_message_id"] = initial_pointer
page_params["initial_pointer"] = initial_pointer
page_params["have_initial_messages"] = (initial_pointer != -1)
page_params["enable_desktop_notifications"] = False
statsd.incr('views.home')
show_invites = True