Updated Branches: refs/heads/trunk cbad978db -> b009c49b5
AMBARI-2974 "Assign Masters" page cannot be selected on "Add Host Wizard". (atkach) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/b009c49b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/b009c49b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/b009c49b Branch: refs/heads/trunk Commit: b009c49b51981240af68c409f0d4b301bfcbfa5a Parents: cbad978 Author: atkach <[email protected]> Authored: Wed Aug 21 14:35:37 2013 +0300 Committer: atkach <[email protected]> Committed: Wed Aug 21 14:35:37 2013 +0300 ---------------------------------------------------------------------- .../app/controllers/main/host/add_controller.js | 8 +- ambari-web/app/routes/add_host_routes.js | 122 ++++++------------- ambari-web/app/templates/main/host/add.hbs | 9 +- ambari-web/app/views/main/host/add_view.js | 18 +-- 4 files changed, 42 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b009c49b/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 16f67cf..d4a4de0 100644 --- a/ambari-web/app/controllers/main/host/add_controller.js +++ b/ambari-web/app/controllers/main/host/add_controller.js @@ -23,7 +23,7 @@ App.AddHostController = App.WizardController.extend({ name: 'addHostController', - totalSteps: 7, + totalSteps: 6, /** * Used for hiding back button in wizard @@ -117,7 +117,6 @@ App.AddHostController = App.WizardController.extend({ console.log('AddHostController.loadServices: loaded data ', servicesInfo); var serviceNames = servicesInfo.filterProperty('isSelected', true).mapProperty('serviceName'); console.log('selected services ', serviceNames); - this.set('content.skipMasterStep', (!serviceNames.contains('HBASE') && !serviceNames.contains('ZOOKEEPER')) || !App.supports.addMasters); }, /** @@ -301,13 +300,10 @@ App.AddHostController = App.WizardController.extend({ loadAllPriorSteps: function () { var step = this.get('currentStep'); switch (step) { - case '9': - case '8': - case '7': case '6': case '5': - this.loadServiceConfigProperties(); case '4': + this.loadServiceConfigProperties(); case '3': this.loadClients(); this.loadServices(); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b009c49b/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 7386e64..28e81ab 100644 --- a/ambari-web/app/routes/add_host_routes.js +++ b/ambari-web/app/routes/add_host_routes.js @@ -55,16 +55,16 @@ module.exports = Em.Route.extend({ if (currentClusterStatus) { switch (currentClusterStatus.clusterState) { case 'ADD_HOSTS_DEPLOY_PREP_2' : - addHostController.setCurrentStep('5'); + addHostController.setCurrentStep('4'); App.db.data = currentClusterStatus.localdb; break; case 'ADD_HOSTS_INSTALLING_3' : case 'SERVICE_STARTING_3' : - addHostController.setCurrentStep('6'); + addHostController.setCurrentStep('5'); App.db.data = currentClusterStatus.localdb; break; case 'ADD_HOSTS_INSTALLED_4' : - addHostController.setCurrentStep('7'); + addHostController.setCurrentStep('6'); App.db.data = currentClusterStatus.localdb; break; default: @@ -158,7 +158,7 @@ module.exports = Em.Route.extend({ step3: Em.Route.extend({ route: '/step3', - connectOutlets: function (router) { + connectOutlets: function (router, context) { console.log('in addHost.step3:connectOutlets'); var controller = router.get('addHostController'); controller.setCurrentStep('3'); @@ -166,50 +166,10 @@ module.exports = Em.Route.extend({ controller.loadAllPriorSteps(); controller.connectOutlet('wizardStep6', controller.get('content')); var wizardStep6Controller = router.get('wizardStep6Controller'); - wizardStep6Controller.set('isMasters', true); - }) - }, - back: function(router) { - var controller = router.get('addHostController'); - if(!controller.get('content.skipMasterStep')) { - router.transitionTo('step2'); - } - else { - router.transitionTo('step1'); - } - }, - next: function (router, context) { - var addHostController = router.get('addHostController'); - var wizardStep6Controller = router.get('wizardStep6Controller'); - addHostController.saveHbZk(wizardStep6Controller); - App.db.setBootStatus(true); - addHostController.loadServicesFromServer(); - router.transitionTo('step4'); - } - }), - - step4: Em.Route.extend({ - route: '/step4', - connectOutlets: function (router, context) { - console.log('in addHost.step4:connectOutlets'); - var controller = router.get('addHostController'); - controller.setCurrentStep('4'); - controller.dataLoading().done(function () { - controller.loadAllPriorSteps(); - controller.connectOutlet('wizardStep6', controller.get('content')); - var wizardStep6Controller = router.get('wizardStep6Controller'); wizardStep6Controller.set('isMasters', false); }); }, - back: function(router) { - var controller = router.get('addHostController'); - if(!controller.get('content.skipMasterStep')) { - router.transitionTo('step2'); - } - else { - router.transitionTo('step1'); - } - }, + back: Em.Router.transitionTo('step2'), next: function (router) { var addHostController = router.get('addHostController'); var wizardStep6Controller = router.get('wizardStep6Controller'); @@ -223,23 +183,23 @@ module.exports = Em.Route.extend({ wizardStep7Controller.set('content', addHostController.get('content')); wizardStep7Controller.loadStep(); addHostController.saveServiceConfigProperties(wizardStep7Controller); - router.transitionTo('step5'); + router.transitionTo('step4'); } } }), - step5: Em.Route.extend({ - route: '/step5', + step4: Em.Route.extend({ + route: '/step4', connectOutlets: function (router, context) { - console.log('in addHost.step5:connectOutlets'); + console.log('in addHost.step4:connectOutlets'); var controller = router.get('addHostController'); - controller.setCurrentStep('5'); + controller.setCurrentStep('4'); controller.dataLoading().done(function () { controller.loadAllPriorSteps(); controller.connectOutlet('wizardStep8', controller.get('content')); }) }, - back: Em.Router.transitionTo('step4'), + back: Em.Router.transitionTo('step3'), next: function (router) { var addHostController = router.get('addHostController'); var wizardStep8Controller = router.get('wizardStep8Controller'); @@ -249,25 +209,25 @@ module.exports = Em.Route.extend({ // We need to do recovery based on whether we are in Add Host or Installer wizard addHostController.saveClusterState('ADD_HOSTS_INSTALLING_3'); wizardStep8Controller.set('servicesInstalled', true); - router.transitionTo('step6'); + router.transitionTo('step5'); } }), - step6: Em.Route.extend({ - route: '/step6', + step5: Em.Route.extend({ + route: '/step5', connectOutlets: function (router, context) { - console.log('in addHost.step6:connectOutlets'); + console.log('in addHost.step5:connectOutlets'); var controller = router.get('addHostController'); - controller.setCurrentStep('6'); + controller.setCurrentStep('5'); controller.dataLoading().done(function () { controller.loadAllPriorSteps(); if (!App.testMode) { //if test mode is ON don't disable prior steps link. - controller.setLowerStepsDisable(6); + controller.setLowerStepsDisable(5); } controller.connectOutlet('wizardStep9', controller.get('content')); }) }, - back: Em.Router.transitionTo('step5'), + back: Em.Router.transitionTo('step4'), retry: function(router,context) { var addHostController = router.get('addHostController'); var wizardStep9Controller = router.get('wizardStep9Controller'); @@ -294,41 +254,36 @@ module.exports = Em.Route.extend({ // 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'); + router.transitionTo('step6'); } }), - step7: Em.Route.extend({ - route: '/step7', + step6: Em.Route.extend({ + route: '/step6', connectOutlets: function (router, context) { console.log('in addHost.step6:connectOutlets'); var controller = router.get('addHostController'); - controller.setCurrentStep('7'); + controller.setCurrentStep('6'); controller.dataLoading().done(function () { controller.loadAllPriorSteps(); if (!App.testMode) { //if test mode is ON don't disable prior steps link. - controller.setLowerStepsDisable(7); + controller.setLowerStepsDisable(6); } controller.connectOutlet('wizardStep10', controller.get('content')); - App.router.get('updateController').set('isWorking', true); + router.get('updateController').set('isWorking', true); }) }, - back: Em.Router.transitionTo('step6'), + back: Em.Router.transitionTo('step5'), complete: function (router, context) { - if (true) { // this function will be moved to installerController where it will validate - var addHostController = router.get('addHostController'); - App.router.get('updateController').updateAll(); - addHostController.finish(); - $(context.currentTarget).parents("#modal").find(".close").trigger('click'); - - // We need to do recovery based on whether we are in Add Host or Installer wizard - addHostController.saveClusterState('ADD_HOSTS_COMPLETED_5'); - - router.transitionTo('main.index'); - } else { - console.log('cluster installation failure'); - //$(context.currentTarget).parents("#modal").find(".close").trigger('click'); - } + var addHostController = router.get('addHostController'); + router.get('updateController').updateAll(); + addHostController.finish(); + $(context.currentTarget).parents("#modal").find(".close").trigger('click'); + + // We need to do recovery based on whether we are in Add Host or Installer wizard + addHostController.saveClusterState('ADD_HOSTS_COMPLETED_5'); + + router.transitionTo('main.index'); } }), @@ -347,14 +302,7 @@ module.exports = Em.Route.extend({ gotoStep5: Em.Router.transitionTo('step5'), - gotoStep6: Em.Router.transitionTo('step6'), - - gotoStep7: Em.Router.transitionTo('step7'), - - gotoStep8: Em.Router.transitionTo('step8'), - - gotoStep9: Em.Router.transitionTo('step9'), + gotoStep6: Em.Router.transitionTo('step6') - gotoStep10: Em.Router.transitionTo('step10') }); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b009c49b/ambari-web/app/templates/main/host/add.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/add.hbs b/ambari-web/app/templates/main/host/add.hbs index 78874b8..becbd19 100644 --- a/ambari-web/app/templates/main/host/add.hbs +++ b/ambari-web/app/templates/main/host/add.hbs @@ -30,11 +30,10 @@ <li class="nav-header">{{t hosts.add.header}}</li> <li {{bindAttr class="isStep1:active view.isStep1Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep1 target="controller"}}>{{t installer.step2.header}}</a></li> <li {{bindAttr class="isStep2:active view.isStep2Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep2 target="controller"}}>{{t installer.step3.header}}</a></li> - <li {{bindAttr class="isStep3:active view.isStep3Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep3 target="controller"}}>{{t installer.step5.header}}</a></li> - <li {{bindAttr class="isStep4:active view.isStep4Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep4 target="controller"}}>{{t installer.step6.header}}</a></li> - <li {{bindAttr class="isStep5:active view.isStep5Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep5 target="controller"}}>{{t installer.step8.header}}</a></li> - <li {{bindAttr class="isStep6:active view.isStep6Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep6 target="controller"}}>{{t installer.step9.header}}</a></li> - <li {{bindAttr class="isStep7:active view.isStep7Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep7 target="controller"}}>{{t installer.step10.header}}</a></li> + <li {{bindAttr class="isStep3:active view.isStep3Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep3 target="controller"}}>{{t installer.step6.header}}</a></li> + <li {{bindAttr class="isStep4:active view.isStep4Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep4 target="controller"}}>{{t installer.step8.header}}</a></li> + <li {{bindAttr class="isStep5:active view.isStep5Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep5 target="controller"}}>{{t installer.step9.header}}</a></li> + <li {{bindAttr class="isStep6:active view.isStep6Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep6 target="controller"}}>{{t installer.step10.header}}</a></li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b009c49b/ambari-web/app/views/main/host/add_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/host/add_view.js b/ambari-web/app/views/main/host/add_view.js index 300af3e..8464f61 100644 --- a/ambari-web/app/views/main/host/add_view.js +++ b/ambari-web/app/views/main/host/add_view.js @@ -47,23 +47,7 @@ App.AddHostView = Em.View.extend({ return this.isStepDisabled(6); }.property('[email protected]').cacheable(), - isStep7Disabled: function () { - return this.isStepDisabled(7); - }.property('[email protected]').cacheable(), - - isStep8Disabled: function () { - return this.isStepDisabled(8); - }.property('[email protected]').cacheable(), - - isStep9Disabled: function () { - return this.isStepDisabled(9); - }.property('[email protected]').cacheable(), - - isStep10Disabled: function () { - return this.isStepDisabled(10); - }.property('[email protected]').cacheable(), - - isStepDisabled: function (index) { + isStepDisabled: function (index) { return this.get('controller.isStepDisabled').findProperty('step', index).get('value'); }
