AMBARI-14701: assign_master_components.js breaks next step in certain case (mithmatt via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9e5dd9f8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9e5dd9f8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9e5dd9f8 Branch: refs/heads/branch-dev-patch-upgrade Commit: 9e5dd9f8990956e1c9de650822d52d4fdddaba0a Parents: e187553 Author: Jun Aoki <ja...@apache.org> Authored: Fri Feb 12 18:15:15 2016 -0800 Committer: Jun Aoki <ja...@apache.org> Committed: Fri Feb 12 18:15:15 2016 -0800 ---------------------------------------------------------------------- .../mixins/wizard/assign_master_components.js | 37 +++++++++++++------- 1 file changed, 25 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9e5dd9f8/ambari-web/app/mixins/wizard/assign_master_components.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js b/ambari-web/app/mixins/wizard/assign_master_components.js index 0693507..a2440a4 100644 --- a/ambari-web/app/mixins/wizard/assign_master_components.js +++ b/ambari-web/app/mixins/wizard/assign_master_components.js @@ -1084,7 +1084,6 @@ App.AssignMasterComponents = Em.Mixin.create({ }else{ App.router.set('nextBtnClickInProgress', false); } - self.set('submitButtonClicked', false); }; if (this.get('useServerValidation')) { @@ -1094,6 +1093,7 @@ App.AssignMasterComponents = Em.Mixin.create({ } else { self.updateIsSubmitDisabled(); goNextStepIfValid(); + self.set('submitButtonClicked', false); } } }, @@ -1104,18 +1104,31 @@ App.AssignMasterComponents = Em.Mixin.create({ */ showValidationIssuesAcceptBox: function(callback) { var self = this; - if (self.get('anyWarning') || self.get('anyError')) { - App.ModalPopup.show({ - primary: Em.I18n.t('common.continueAnyway'), - header: Em.I18n.t('installer.step5.validationIssuesAttention.header'), - body: Em.I18n.t('installer.step5.validationIssuesAttention'), - onPrimary: function () { - this.hide(); - callback(); - } - }); - } else { + + // If there are no warnings and no errors, return + if (!self.get('anyWarning') && !self.get('anyError')) { callback(); + self.set('submitButtonClicked', false); + return; } + + App.ModalPopup.show({ + primary: Em.I18n.t('common.continueAnyway'), + header: Em.I18n.t('installer.step5.validationIssuesAttention.header'), + body: Em.I18n.t('installer.step5.validationIssuesAttention'), + onPrimary: function () { + this._super(); + callback(); + self.set('submitButtonClicked', false); + }, + onSecondary: function () { + this._super(); + self.set('submitButtonClicked', false); + }, + onClose: function () { + this._super(); + self.set('submitButtonClicked', false); + } + }); } });