Repository: ambari Updated Branches: refs/heads/branch-2.1 b71ad4bb6 -> 50cb277a5
AMBARI-12194. Installer allows stepping over step 4 and errors out (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/50cb277a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/50cb277a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/50cb277a Branch: refs/heads/branch-2.1 Commit: 50cb277a5f636bf525e5d966319122d26edfcfed Parents: b71ad4b Author: Alex Antonenko <[email protected]> Authored: Sun Jun 28 22:22:30 2015 +0300 Committer: Alex Antonenko <[email protected]> Committed: Sun Jun 28 22:22:30 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/routes/installer.js | 17 ++++++++++------- ambari-web/app/views/wizard/step3_view.js | 1 + ambari-web/app/views/wizard/step4_view.js | 6 +++++- 3 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/50cb277a/ambari-web/app/routes/installer.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js index 05f3775..f026934 100644 --- a/ambari-web/app/routes/installer.js +++ b/ambari-web/app/routes/installer.js @@ -174,13 +174,16 @@ module.exports = Em.Route.extend(App.RouterRedirections, { router.transitionTo('step2'); }, next: function (router, context) { - var installerController = router.get('installerController'); - var wizardStep3Controller = router.get('wizardStep3Controller'); - installerController.saveConfirmedHosts(wizardStep3Controller); - installerController.setDBProperty('bootStatus', true); - installerController.setDBProperty('selectedServiceNames', undefined); - installerController.setDBProperty('installedServiceNames', undefined); - router.transitionTo('step4'); + if (!router.transitionInProgress) { + router.set('transitionInProgress', true); + var installerController = router.get('installerController'); + var wizardStep3Controller = router.get('wizardStep3Controller'); + installerController.saveConfirmedHosts(wizardStep3Controller); + installerController.setDBProperty('bootStatus', true); + installerController.setDBProperty('selectedServiceNames', undefined); + installerController.setDBProperty('installedServiceNames', undefined); + router.transitionTo('step4'); + } }, exit: function (router) { router.get('wizardStep3Controller').set('stopBootstrap', true); http://git-wip-us.apache.org/repos/asf/ambari/blob/50cb277a/ambari-web/app/views/wizard/step3_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/step3_view.js b/ambari-web/app/views/wizard/step3_view.js index c083e6b..4f44c11 100644 --- a/ambari-web/app/views/wizard/step3_view.js +++ b/ambari-web/app/views/wizard/step3_view.js @@ -107,6 +107,7 @@ App.WizardStep3View = App.TableView.extend({ didInsertElement: function () { this.get('controller').loadStep(); + App.get('router').set('transitionInProgress', false); }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/50cb277a/ambari-web/app/views/wizard/step4_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/step4_view.js b/ambari-web/app/views/wizard/step4_view.js index 95c721b..3def0c5 100644 --- a/ambari-web/app/views/wizard/step4_view.js +++ b/ambari-web/app/views/wizard/step4_view.js @@ -21,6 +21,10 @@ var App = require('app'); App.WizardStep4View = Em.View.extend({ - templateName: require('templates/wizard/step4') + templateName: require('templates/wizard/step4'), + + didInsertElement: function () { + App.get('router').set('transitionInProgress', false); + } }); \ No newline at end of file
