← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/longpoll-message into lp:maas

 

Raphaël Badin has proposed merging lp:~rvb/maas/longpoll-message into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/longpoll-message/+merge/110762

This tiny branch improves the JS comment displayed when longpoll is disabled (this happens for instance when no rabbitmq server is reachable).
-- 
https://code.launchpad.net/~rvb/maas/longpoll-message/+merge/110762
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/longpoll-message into lp:maas.
=== modified file 'src/maasserver/templates/maasserver/index.html'
--- src/maasserver/templates/maasserver/index.html	2012-04-30 13:49:53 +0000
+++ src/maasserver/templates/maasserver/index.html	2012-06-18 09:27:49 +0000
@@ -38,12 +38,14 @@
 	  {srcNode: '.page-title-form'});
       title_widget.render();
 
+      {% if longpoll_queue and LONGPOLL_PATH %}
       // Start longpoll.
-      {% if longpoll_queue and LONGPOLL_PATH %}
         Y.later(0, Y.maas.longpoll, function() {
           var longpollmanager = Y.maas.longpoll.setupLongPollManager(
             '{{ longpoll_queue }}', '{{ LONGPOLL_PATH }}');
         });
+      {% else %}
+      // Longoll disabled.
       {% endif %}
 
     });