Repository: ambari Updated Branches: refs/heads/trunk 18fcecb03 -> c56930589
AMBARI-14406. Display A Dialog When Beginning An Upgrade.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c5693058 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c5693058 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c5693058 Branch: refs/heads/trunk Commit: c569305894f513e3044bc0ecea2d23b55daccb12 Parents: 18fcecb Author: Xi Wang <[email protected]> Authored: Wed Dec 16 14:21:09 2015 -0800 Committer: Xi Wang <[email protected]> Committed: Wed Dec 16 16:42:18 2015 -0800 ---------------------------------------------------------------------- .../main/admin/stack_and_upgrade_controller.js | 10 ++++++++++ ambari-web/app/messages.js | 2 ++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c5693058/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js index e6179b5..2760c81 100644 --- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js +++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js @@ -589,6 +589,13 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, } }); this.setDBProperty('currentVersion', this.get('currentVersion')); + + // show a "preparing the upgrade..." dialog in case the api call returns too slow + setTimeout(function () { + if (App.router.get('currentState.name') != 'stackUpgrade') { + App.showAlertPopup(Em.I18n.t('admin.stackUpgrade.dialog.prepareUpgrade.header'), Em.I18n.t('admin.stackUpgrade.dialog.prepareUpgrade.body')); + } + }, 1000); }, /** @@ -1383,6 +1390,9 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, * @return {App.ModalPopup} */ openUpgradeDialog: function () { + if ($('.modal') && $('.modal .modal-header #modal-label').text().trim() == Em.I18n.t('admin.stackUpgrade.dialog.prepareUpgrade.header')) { + $('.modal .modal-footer button.btn-success').click(); + } App.router.transitionTo('admin.stackUpgrade'); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/c5693058/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 8ef7d57..4ce2592 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1568,6 +1568,8 @@ Em.I18n.translations = { 'admin.stackUpgrade.dialog.details.open': "show details", 'admin.stackUpgrade.dialog.details.hide': "hide details", 'admin.stackUpgrade.dialog.notActive': "Waiting to execute the next task...", + 'admin.stackUpgrade.dialog.prepareUpgrade.header': "Preparing the Upgrade...", + 'admin.stackUpgrade.dialog.prepareUpgrade.body': "Please wait...", 'services.service.start':'Start', 'services.service.stop':'Stop', 'services.service.metrics':'Metrics',
