AMBARI-1317. Deploy progress returns to deploy screen (momentarily). (Arun Kandregula via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1440758 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -202,6 +202,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1317. Deploy progress returns to deploy screen (momentarily).
+ (Arun Kandregula via yusaku) 
+
  AMBARI-1316. Vertical scrollbar shows regardless of how tall the browser height
  is (content height is always slightly taller than viewport). (Arun Kandregula via
  yusaku)

ambari-web/app/controllers/wizard/step8_controller.js

@@ -30,6 +30,7 @@ App.WizardStep8Controller = Em.Controller.extend({
   slaveComponentConfig: null,
   isSubmitDisabled: false,
   hasErrorOccurred: false,
+  servicesInstalled: false,
 
   selectedServices: function () {
     return this.get('content.services').filterProperty('isSelected', true).filterProperty('isInstalled', false);
@@ -40,6 +41,7 @@ App.WizardStep8Controller = Em.Controller.extend({
     this.get('configs').clear();
     this.get('globals').clear();
     this.get('clusterInfo').clear();
+    this.set('servicesInstalled', false);
   },
 
   loadStep: function () {

ambari-web/app/routes/add_host_routes.js

@@ -214,6 +214,7 @@ module.exports = Em.Route.extend({
         wizardControllerName: App.router.get('addHostController.name'),
         localdb: App.db.data
       });
+      wizardStep8Controller.set('servicesInstalled', true);
       router.transitionTo('step5');
     }
   }),

ambari-web/app/routes/installer.js

@@ -294,6 +294,7 @@ module.exports = Em.Route.extend({
         wizardControllerName: App.router.get('installerController.name'),
         localdb: App.db.data
       });
+      wizardStep8Controller.set('servicesInstalled', true);
       router.transitionTo('step9');
     }
   }),

ambari-web/app/views/wizard/step8_view.js

@@ -83,10 +83,10 @@ App.WizardStep8View = Em.View.extend({
         }.property('ajaxQueueComplete', 'ajaxQueueLength'),
 
         autoHide: function() {
-          if (this.get('ajaxQueueComplete') === this.get('ajaxQueueLength')) {
+          if (this.get('controller.servicesInstalled')) {
             this.get('parentView').hide();
           }
-        }.observes('ajaxQueueComplete', 'ajaxQueueLength')
+        }.observes('controller.servicesInstalled')
       })
     }));
   }.observes('controller.isSubmitDisabled')