Repository: ambari Updated Branches: refs/heads/branch-2.1 6f097c93a -> e85d345e0
AMBARI-12311. Add Host Wizard appears on every login and cannot get it to go away (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e85d345e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e85d345e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e85d345e Branch: refs/heads/branch-2.1 Commit: e85d345e0cdcdfe4dae13f8ae8d340930bbdcdb2 Parents: 6f097c9 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Tue Jul 7 16:04:56 2015 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Tue Jul 7 16:04:56 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/main/host/add_controller.js | 1 - ambari-web/app/routes/add_host_routes.js | 8 +++++++- ambari-web/app/templates/application.hbs | 6 ++++-- ambari-web/test/controllers/main/host/add_controller_test.js | 3 --- 4 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e85d345e/ambari-web/app/controllers/main/host/add_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host/add_controller.js b/ambari-web/app/controllers/main/host/add_controller.js index 3f2c0f9..c474c72 100644 --- a/ambari-web/app/controllers/main/host/add_controller.js +++ b/ambari-web/app/controllers/main/host/add_controller.js @@ -377,7 +377,6 @@ App.AddHostController = App.WizardController.extend({ * Clear all temporary data */ finish: function () { - this.setCurrentStep('1'); this.clearAllSteps(); this.clearStorageData(); App.router.get('updateController').updateAll(); http://git-wip-us.apache.org/repos/asf/ambari/blob/e85d345e/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 b497cdf..7bfe04c 100644 --- a/ambari-web/app/routes/add_host_routes.js +++ b/ambari-web/app/routes/add_host_routes.js @@ -29,7 +29,13 @@ module.exports = App.WizardRoute.extend({ clusterName: App.router.get('content.cluster.name'), clusterState: 'DEFAULT', localdb: App.db.data - }, {alwaysCallback: function() {context.hide();App.router.transitionTo('hosts.index');location.reload();}}); + }, { + alwaysCallback: function() { + context.hide(); + App.router.transitionTo('hosts.index'); + location.reload(); + } + }); }, enter: function (router) { http://git-wip-us.apache.org/repos/asf/ambari/blob/e85d345e/ambari-web/app/templates/application.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs index e6de54e..f9f70f4 100644 --- a/ambari-web/app/templates/application.hbs +++ b/ambari-web/app/templates/application.hbs @@ -81,8 +81,10 @@ <li><a href="" {{action showSettingsPopup target="controller"}}>{{t app.settings}}</a></li> {{/isAccessible}} {{/if}} - <li class="break"></li> - <li><a href="" id="sign-out" {{action logoff}}>{{t app.signout}}</a></li> + {{#if isClusterDataLoaded}} + <li class="break"></li> + <li><a href="" id="sign-out" {{action logoff}}>{{t app.signout}}</a></li> + {{/if}} </ul> </div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/e85d345e/ambari-web/test/controllers/main/host/add_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/host/add_controller_test.js b/ambari-web/test/controllers/main/host/add_controller_test.js index 826a415..2fe4341 100644 --- a/ambari-web/test/controllers/main/host/add_controller_test.js +++ b/ambari-web/test/controllers/main/host/add_controller_test.js @@ -1282,7 +1282,6 @@ describe('App.AddHostController', function () { getAllHostNames: Em.K }; beforeEach(function () { - sinon.stub(controller, 'setCurrentStep', Em.K); sinon.stub(controller, 'clearAllSteps', Em.K); sinon.stub(controller, 'clearStorageData', Em.K); sinon.stub(App.updater, 'immediateRun', Em.K); @@ -1291,7 +1290,6 @@ describe('App.AddHostController', function () { sinon.spy(mock, 'getAllHostNames'); }); afterEach(function () { - controller.setCurrentStep.restore(); controller.clearAllSteps.restore(); controller.clearStorageData.restore(); App.updater.immediateRun.restore(); @@ -1301,7 +1299,6 @@ describe('App.AddHostController', function () { }); it("", function () { controller.finish(); - expect(controller.setCurrentStep.calledWith('1')).to.be.true; expect(controller.clearAllSteps.calledOnce).to.be.true; expect(controller.clearStorageData.calledOnce).to.be.true; expect(mock.updateAll.calledOnce).to.be.true;
