You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/01 16:41:45 UTC
[08/39] ambari git commit: AMBARI-14817. ASW with Oozie can't proceed
step7 (alexantonenko)
AMBARI-14817. ASW with Oozie can't proceed step7
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d38a9531
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d38a9531
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d38a9531
Branch: refs/heads/branch-dev-patch-upgrade
Commit: d38a9531efa667e644ce7b67e041f8f6ad2d06a9
Parents: 75be3b9
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Jan 28 04:56:59 2016 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Jan 28 04:56:59 2016 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step0_controller.js | 2 +-
ambari-web/app/controllers/wizard/step3_controller.js | 3 ++-
ambari-web/app/controllers/wizard/step7_controller.js | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d38a9531/ambari-web/app/controllers/wizard/step0_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step0_controller.js b/ambari-web/app/controllers/wizard/step0_controller.js
index 4e60d1b..aa3541a 100644
--- a/ambari-web/app/controllers/wizard/step0_controller.js
+++ b/ambari-web/app/controllers/wizard/step0_controller.js
@@ -73,12 +73,12 @@ App.WizardStep0Controller = Em.Controller.extend({
if(App.router.nextBtnClickInProgress){
return;
}
- App.router.nextBtnClickInProgress = true;
this.set('hasSubmitted', true);
if (!this.get('invalidClusterName')) {
App.clusterStatus.set('clusterName', this.get('content.cluster.name'));
this.set('content.cluster.status', 'PENDING');
this.set('content.cluster.isCompleted', false);
+ App.router.nextBtnClickInProgress = true;
App.router.send('next');
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d38a9531/ambari-web/app/controllers/wizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js
index 6fd4563..8ae9068 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -1657,17 +1657,18 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin, {
if(App.router.nextBtnClickInProgress){
return;
}
- App.router.nextBtnClickInProgress = true;
if (this.get('isHostHaveWarnings')) {
return App.showConfirmationPopup(
function () {
self.set('confirmedHosts', self.get('bootHosts'));
+ App.router.nextBtnClickInProgress = true;
App.router.send('next');
},
Em.I18n.t('installer.step3.hostWarningsPopup.hostHasWarnings'));
}
else {
this.set('confirmedHosts', this.get('bootHosts'));
+ App.router.nextBtnClickInProgress = true;
App.router.send('next');
}
return null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/d38a9531/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 81e69d6..f6b6cb3 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -1638,6 +1638,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
* Proceed to the next step
**/
moveNext: function () {
+ App.router.nextBtnClickInProgress = true;
App.router.send('next');
this.set('submitButtonClicked', false);
},
@@ -1651,7 +1652,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
if (this.get('isSubmitDisabled') || App.router.nextBtnClickInProgress) {
return false;
}
- App.router.nextBtnClickInProgress = true;
var preInstallChecksController = App.router.get('preInstallChecksController');
if (this.get('supportsPreInstallChecks')) {
if (preInstallChecksController.get('preInstallChecksWhereRun')) {