Merge pull request #4220 from GordonSmith/HPCC-9113

HPCC-9113 Running workunit not refreshing tabs Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
hpcc-systems · Apr 10, 2013 · 8432242 · 8432242
2 parents ef541ac + 9329490
commit 8432242
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/esp/files/scripts/ESPWorkunit.js b/esp/files/scripts/ESPWorkunit.js
@@ -186,11 +186,10 @@ define([
             return this.hasCompleted;
         },
         monitor: function (callback) {
-            if (this.hasCompleted) {
-                if (callback) {
-                    callback(this);
-                }
-            } else {
+            if (callback) {
+                callback(this);
+            }
+            if (!this.hasCompleted) {
                 var context = this;
                 this.watch("changedCount", function (name, oldValue, newValue) {
                     if (oldValue !== newValue && newValue) {

diff --git a/esp/files/scripts/ResultsWidget.js b/esp/files/scripts/ResultsWidget.js
@@ -131,7 +131,7 @@ define([
                             }
                         });
                         var currSel = context.getSelectedChild();
-                        if (currSel) {
+                        if (currSel && currSel.refresh) {
                             currSel.refresh();
                         }
                     }