Repository: ambari Updated Branches: refs/heads/branch-2.5 6b93dc182 -> b78254880
AMBARI-20261 Unexpected popup after disable kerberos "You are in the process of disabling security on your cluster" (dbuzhor) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7825488 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7825488 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7825488 Branch: refs/heads/branch-2.5 Commit: b7825488068ae0e634501053d999b6f8b1e0c091 Parents: 6b93dc1 Author: Denys Buzhor <[email protected]> Authored: Wed Mar 1 22:17:14 2017 +0200 Committer: Denys Buzhor <[email protected]> Committed: Wed Mar 1 23:23:49 2017 +0200 ---------------------------------------------------------------------- ambari-web/app/routes/main.js | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b7825488/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index 05a86f3..35f637c 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -438,21 +438,20 @@ module.exports = Em.Route.extend(App.RouterRedirections, { self.proceedOnClose(); return; } - // warn user if disable kerberos command in progress - var unkerberizeCommand = controller.get('tasks').findProperty('command', 'unkerberize'); - if (unkerberizeCommand && !unkerberizeCommand.get('isCompleted')) { - // user cannot exit wizard during removing kerberos - if (unkerberizeCommand.get('status') == 'IN_PROGRESS') { - App.showAlertPopup(Em.I18n.t('admin.kerberos.disable.unkerberize.header'), Em.I18n.t('admin.kerberos.disable.unkerberize.message')); - } else { - // otherwise show confirmation window - App.showConfirmationPopup(function () { - self.proceedOnClose(); - }, Em.I18n.t('admin.security.disable.onClose')); - } - } else { + var unkerberizeCommand = controller.get('tasks').findProperty('command', 'unkerberize') || Em.Object.create(); + var isUnkerberizeInProgress = unkerberizeCommand.get('status') === 'IN_PROGRESS'; + if (controller.get('tasks').everyProperty('status', 'COMPLETED')) { self.proceedOnClose(); + return; } + // user cannot exit wizard during removing kerberos + if (isUnkerberizeInProgress) { + App.showAlertPopup(Em.I18n.t('admin.kerberos.disable.unkerberize.header'), Em.I18n.t('admin.kerberos.disable.unkerberize.message')); + return; + } + App.showConfirmationPopup(function () { + self.proceedOnClose(); + }, Em.I18n.t('admin.security.disable.onClose')); }, proceedOnClose: function () { var self = this;
