ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-3965. "Add New Hosts" wizard drops out to step "Install, start and test" of installer. (yusaku)
Date Wed, 04 Dec 2013 00:53:18 GMT
Updated Branches:
  refs/heads/branch-1.4.2 5e59ec5b7 -> d9a1c81f6


AMBARI-3965. "Add New Hosts" wizard drops out to step "Install, start and test" of installer.
(yusaku)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d9a1c81f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d9a1c81f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d9a1c81f

Branch: refs/heads/branch-1.4.2
Commit: d9a1c81f67dc9ec75f30468de9b5a10017ccd9ea
Parents: 5e59ec5
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Tue Dec 3 16:54:08 2013 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Tue Dec 3 16:54:08 2013 -0800

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step9_controller.js | 1 +
 ambari-web/app/routes/add_host_routes.js              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9a1c81f/ambari-web/app/controllers/wizard/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step9_controller.js b/ambari-web/app/controllers/wizard/step9_controller.js
index c718883..1773e05 100644
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++ b/ambari-web/app/controllers/wizard/step9_controller.js
@@ -414,6 +414,7 @@ App.WizardStep9Controller = Em.Controller.extend({
     // We need to do recovery if there is a browser crash
     App.clusterStatus.setClusterStatus({
       clusterState: 'SERVICE_STARTING_3',
+      wizardControllerName: this.get('content.controllerName'),
       localdb: App.db.data
     });
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9a1c81f/ambari-web/app/routes/add_host_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_host_routes.js b/ambari-web/app/routes/add_host_routes.js
index cf0d0bc..f375830 100644
--- a/ambari-web/app/routes/add_host_routes.js
+++ b/ambari-web/app/routes/add_host_routes.js
@@ -298,11 +298,11 @@ module.exports = Em.Route.extend({
     next: function (router) {
       var addHostController = router.get('addHostController');
       var wizardStep9Controller = router.get('wizardStep9Controller');
+      wizardStep9Controller.set('wizardController', addHostController);
       addHostController.saveInstalledHosts(wizardStep9Controller);
 
       // We need to do recovery based on whether we are in Add Host or Installer wizard
       addHostController.saveClusterState('ADD_HOSTS_INSTALLED_4');
-
       router.transitionTo('step7');
     }
   }),


Mime
View raw message