fix(monitoring service): Fix columns on list page (MON-3217)

centreon · Dec 12, 2018 · 1bf7ff5 · 1bf7ff5
1 parent 4cc53de
commit 1bf7ff5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/www/include/monitoring/status/Common/commonJS.php b/www/include/monitoring/status/Common/commonJS.php
@@ -1001,7 +1001,11 @@ function monitoring_play()  {
     document.getElementById('JS_monitoring_pause_gray').style.display = 'none';
     document.getElementById('JS_monitoring_play_gray').style.display = 'block';
     _on = 1;
-    initM(<?php echo $tM?>,"<?php echo $sid?>","<?php echo $o?>");
+    // Allows to use the new status when click on the play button
+    if (typeof(_o) == "undefined") {
+        _o = "<?= $o ?>";
+    }
+    initM(<?php echo $tM?>, "<?php echo $sid?>", _o)
 }
 
 function monitoring_pause() {

diff --git a/www/include/monitoring/status/Services/service.php b/www/include/monitoring/status/Services/service.php
@@ -521,8 +521,6 @@ function updateSelect() {
 
     jQuery(function () {
         preInit();
-        /* Disable to prevent double Ajax call*/
-        //updateSelect();
     });
 
     function preInit() {
@@ -578,7 +576,5 @@ function filterCrit(value) {
 
     function statusServices(value, isInit) {
         _o = value;
-        window.clearTimeout(_timeoutID);
-        initM(_tm, _sid, _o);
     }
 </script>
diff --git a/www/include/monitoring/status/Services/serviceJS.php b/www/include/monitoring/status/Services/serviceJS.php
@@ -235,6 +235,9 @@ function initM(_time_reload, _sid, _o) {
     }
 
     function goM(_time_reload, _sid, _o) {
+        if (_on == 0) {
+            return;
+        }
         _lock = 1;
         var proc = new Transformation();
 
@@ -264,6 +267,9 @@ function goM(_time_reload, _sid, _o) {
         }
 
         _lock = 0;
+        if (_timeoutID) { // Kill next execution if in queue
+            clearTimeout(_timeoutID);
+        }
         _timeoutID = cycleVisibilityChange(function(){goM(_time_reload, _sid, _o)}, _time_reload);
         _time_live = _time_reload;
         _on = 1;