openlp-core team mailing list archive

[Erik Lundin <erik.lundin@xxxxxx>]

Erik Lundin has proposed merging lp:~erik-lundin/openlp/bug-1038694 into lp:openlp.

Commit message:
Fixed bug #1038694 'Change in service order not reflected in stage view'

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1038694 in OpenLP: "Change in service order not reflected in stage view"
  https://bugs.launchpad.net/openlp/+bug/1038694

For more details, see:
https://code.launchpad.net/~erik-lundin/openlp/bug-1038694/+merge/128400

Fixed bug #1038694. Use the service ID from the remote API poll to check whether the service has been modified.
-- 
https://code.launchpad.net/~erik-lundin/openlp/bug-1038694/+merge/128400
Your team OpenLP Core is requested to review the proposed merge of lp:~erik-lundin/openlp/bug-1038694 into lp:openlp.

=== modified file 'openlp/plugins/remotes/html/stage.js'
--- openlp/plugins/remotes/html/stage.js	2012-06-22 14:14:53 +0000
+++ openlp/plugins/remotes/html/stage.js	2012-10-08 00:53:23 +0000
@@ -139,8 +139,10 @@
       "/api/poll",
       function (data, status) {
         OpenLP.updateClock(data);
-        if (OpenLP.currentItem != data.results.item) {
+        if (OpenLP.currentItem != data.results.item ||
+            OpenLP.currentService != data.results.service) {
           OpenLP.currentItem = data.results.item;
+          OpenLP.currentService = data.results.service;
           OpenLP.loadSlides();
         }
         else if (OpenLP.currentSlide != data.results.slide) {