Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Show a user-visible error message when mirroring is not working. 

The main problem with this code is that the error message doesn't go
away until you reload.  To fix this, we need to add a noblock option
on get_updates.

(imported from commit dc45af397bcf06a218bda5dd224ebd5fdf3462db)
This commit is contained in:
Tim Abbott 2012-11-20 16:13:06 -05:00 committed by Zev Benjamin
parent eefa5b2d7b
commit fac24df233
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
templates/zephyr/index.html
View File

@ -179,7 +179,12 @@ var people_list = [
<strong>Can't receive messages</strong> <strong>Can't receive messages</strong>
&mdash; retrying soon. <a class="cursor_pointer" onclick="restart_get_updates({dont_block: true});">Try now</a>. &mdash; retrying soon. <a class="cursor_pointer" onclick="restart_get_updates({dont_block: true});">Try now</a>.
</div> </div>
<div class="alert alert_sidebar alert-error home-error-bar" id="reloading-application"> <div class="alert alert_sidebar alert-error home-error-bar" id="zephyr-mirror-error">
<strong>Messages you send are not being mirrored to MIT zephyr</strong>
&mdash; Please check that you are still running the MIT
Zephyr mirroring bot. <a class="cursor_pointer" onclick="restart_get_updates({dont_block: true});">Check now</a>
</div>
<div class="alert alert_sidebar alert-error home-error-bar" id="reloading-application">
</div> </div>
<div class="alert alert_sidebar" id="home-error"></div> <div class="alert alert_sidebar" id="home-error"></div>
<div class="alert alert_sidebar" id="stream-dne"> <div class="alert alert_sidebar" id="stream-dne">

6
zephyr/static/js/zephyr.js
View File

@ -596,6 +596,12 @@ function get_updates(options) {
add_messages(data.messages, true); add_messages(data.messages, true);
} }
if (data.zephyr_mirror_active === false) {
$('#zephyr-mirror-error').show();
} else {
$('#zephyr-mirror-error').hide();
}
// Pointer sync is disabled for now // Pointer sync is disabled for now
// if (data.new_pointer !== undefined // if (data.new_pointer !== undefined
// && data.new_pointer !== selected_message_id) // && data.new_pointer !== selected_message_id)

12
zephyr/views.py
View File

@ -311,6 +311,17 @@ def format_updates_response(messages=[], apply_markdown=True,
'update_types': update_types} 'update_types': update_types}
if new_pointer is not None: if new_pointer is not None:
ret['new_pointer'] = new_pointer ret['new_pointer'] = new_pointer
if user_profile.realm.domain == "mit.edu":
try:
activity = UserActivity.objects.get(user_profile = user_profile,
query="/api/v1/get_messages",
client__name="zephyr_mirror")
ret['zephyr_mirror_active'] = \
(activity.last_visit.replace(tzinfo=None) >
datetime.datetime.utcnow() - datetime.timedelta(minutes=5))
except UserActivity.DoesNotExist:
pass
return ret return ret
def format_delayed_updates_response(request=None, user_profile=None, def format_delayed_updates_response(request=None, user_profile=None,
@ -331,6 +342,7 @@ def format_delayed_updates_response(request=None, user_profile=None,
update_types.append("pointer_update") update_types.append("pointer_update")
return format_updates_response(new_pointer=pointer, return format_updates_response(new_pointer=pointer,
user_profile=user_profile,
update_types=update_types, **kwargs) update_types=update_types, **kwargs)
def return_messages_immediately(user_profile, client_id, last, def return_messages_immediately(user_profile, client_id, last,