Updated Branches: refs/heads/trunk 6dcda0d51 -> 71226d354
AMBARI-3602. Reassign wizard: Show a confirmation popup for continuing ahead after the manual command step. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/71226d35 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/71226d35 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/71226d35 Branch: refs/heads/trunk Commit: 71226d354266ec59ea16d1f9e921a3dd17d81a33 Parents: 6dcda0d Author: Aleksandr Kovalenko <[email protected]> Authored: Mon Oct 28 17:58:49 2013 +0200 Committer: Aleksandr Kovalenko <[email protected]> Committed: Mon Oct 28 17:58:49 2013 +0200 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + ambari-web/app/routes/reassign_master_routes.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/71226d35/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 9a3f4e6..9b2877f 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1153,6 +1153,7 @@ Em.I18n.translations = { '</div>', 'services.reassign.step5.body.securityNotice': 'Note: {0}', 'services.reassign.step5.body.securityConfigsList': 'Keytab file <b>{0}</b> containing principal <b>{1}</b> should exist on <b>{2}</b>', + 'services.reassign.step5.confirmPopup.body': 'Please confirm that you have run the manual steps before continuing.', 'services.reassign.step6.header': 'Start and Test services', 'services.reassign.step6.task0.title': 'Delete disabled {0}', 'services.reassign.step6.task1.title': 'Start All Services', http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/71226d35/ambari-web/app/routes/reassign_master_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/reassign_master_routes.js b/ambari-web/app/routes/reassign_master_routes.js index acc99bf..a707421 100644 --- a/ambari-web/app/routes/reassign_master_routes.js +++ b/ambari-web/app/routes/reassign_master_routes.js @@ -221,7 +221,11 @@ module.exports = Em.Route.extend({ } }) }, - next: Em.Router.transitionTo('step6'), + next: function (router) { + App.showConfirmationPopup(function () { + router.transitionTo('step6'); + }, Em.I18n.t('services.reassign.step5.confirmPopup.body')); + }, unroutePath: function () { return false;
