incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1440758 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/wizard/step8_controller.js ambari-web/app/routes/add_host_routes.js ambari-web/app/routes/installer.js ambari-web/app/views/wizard/step8_view.js
Date Thu, 31 Jan 2013 00:37:47 GMT
Author: yusaku
Date: Thu Jan 31 00:37:46 2013
New Revision: 1440758

URL: http://svn.apache.org/viewvc?rev=1440758&view=rev
Log:
AMBARI-1317. Deploy progress returns to deploy screen (momentarily). (Arun Kandregula via
yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
    incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js
    incubator/ambari/trunk/ambari-web/app/routes/installer.js
    incubator/ambari/trunk/ambari-web/app/views/wizard/step8_view.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1440758&r1=1440757&r2=1440758&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Jan 31 00:37:46 2013
@@ -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)

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1440758&r1=1440757&r2=1440758&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js Thu Jan 31
00:37:46 2013
@@ -30,6 +30,7 @@ App.WizardStep8Controller = Em.Controlle
   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.Controlle
     this.get('configs').clear();
     this.get('globals').clear();
     this.get('clusterInfo').clear();
+    this.set('servicesInstalled', false);
   },
 
   loadStep: function () {

Modified: incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js?rev=1440758&r1=1440757&r2=1440758&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js Thu Jan 31 00:37:46 2013
@@ -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');
     }
   }),

Modified: incubator/ambari/trunk/ambari-web/app/routes/installer.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/installer.js?rev=1440758&r1=1440757&r2=1440758&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/installer.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/installer.js Thu Jan 31 00:37:46 2013
@@ -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');
     }
   }),

Modified: incubator/ambari/trunk/ambari-web/app/views/wizard/step8_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/wizard/step8_view.js?rev=1440758&r1=1440757&r2=1440758&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/wizard/step8_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/wizard/step8_view.js Thu Jan 31 00:37:46 2013
@@ -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')



Mime
View raw message