Fix Progress in case no percentage is available

truenas · Jun 28, 2013 · ba01141 · ba01141
1 parent 6f12775
commit ba01141
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/gui/freeadmin/static/lib/js/freeadmin/Progress.js b/gui/freeadmin/static/lib/js/freeadmin/Progress.js
@@ -113,26 +113,29 @@ define([
         });
         me._iter += 1;
       } else {
-      console.log("next", me.poolUrl);
         xhr.get(me.poolUrl, {
           headers: {"X-Progress-ID": me.uuid},
           handleAs: "json"
         }).then(function(data) {
           if(data.step) {
             me._curStep = data.step;
           }
-          if(data.percent == 100) {
-            me._subProgress.update({'indeterminate': true});
-            me._masterProgress(data.percent);
-            if(me._curStep == me._numSteps)
-              return;
+          if(data.percent) {
+            if(data.percent == 100) {
+              me._subProgress.update({'indeterminate': true});
+              me._masterProgress(data.percent);
+              if(me._curStep == me._numSteps)
+                return;
+            } else {
+              me._subProgress.update({
+                maximum: 100,
+                progress: data.percent,
+                indeterminate: false
+              });
+              me._masterProgress(data.percent);
+            }
           } else {
-            me._subProgress.update({
-              maximum: 100,
-              progress: data.percent,
-              indeterminate: false
-            });
-            me._masterProgress(data.percent);
+            me._subProgress.update({'indeterminate': true});
           }
           setTimeout(function() {
             me.update();