Repository: ambari Updated Branches: refs/heads/trunk 819b67bb3 -> e06e19c8f
AMBARI-11649. Install Wizard, Step6: Next button is not working after closing warning popup (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e06e19c8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e06e19c8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e06e19c8 Branch: refs/heads/trunk Commit: e06e19c8f8d1bb4a72dabebd522e8ebc84107b04 Parents: 819b67b Author: Aleksandr Kovalenko <[email protected]> Authored: Wed Jun 3 16:16:52 2015 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Wed Jun 3 16:16:52 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/routes/installer.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e06e19c8/ambari-web/app/routes/installer.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js index 6cc053e..3cd0d68 100644 --- a/ambari-web/app/routes/installer.js +++ b/ambari-web/app/routes/installer.js @@ -273,10 +273,10 @@ module.exports = Em.Route.extend(App.RouterRedirections, { var controller = router.get('installerController'); var wizardStep6Controller = router.get('wizardStep6Controller'); var wizardStep7Controller = router.get('wizardStep7Controller'); - if(!router.transitionInProgress) { - router.set('transitionInProgress', true); - if (!wizardStep6Controller.get('submitDisabled')) { - wizardStep6Controller.showValidationIssuesAcceptBox(function () { + if (!wizardStep6Controller.get('submitDisabled')) { + wizardStep6Controller.showValidationIssuesAcceptBox(function () { + if (!router.transitionInProgress) { + router.set('transitionInProgress', true); controller.saveSlaveComponentHosts(wizardStep6Controller); controller.get('content').set('serviceConfigProperties', null); controller.setDBProperty('serviceConfigProperties', null); @@ -287,8 +287,8 @@ module.exports = Em.Route.extend(App.RouterRedirections, { controller.loadAdvancedConfigs(wizardStep7Controller); wizardStep7Controller.set('isAdvancedConfigLoaded', false); router.transitionTo('step7'); - }); - } + } + }); } } }),
