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 2015/12/23 16:07:18 UTC
[39/51] [abbrv] ambari git commit: Revert "AMBARI-14406. Display A
Dialog When Beginning An Upgrade.(xiwang)"
Revert "AMBARI-14406. Display A Dialog When Beginning An Upgrade.(xiwang)"
This reverts commit c569305894f513e3044bc0ecea2d23b55daccb12.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1ed72b8c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1ed72b8c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1ed72b8c
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 1ed72b8c564af8b392c2794d049ee7fe7472cbbf
Parents: f0c1e2e
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Tue Dec 22 10:07:41 2015 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Tue Dec 22 10:07:41 2015 -0800
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 10 ----------
ambari-web/app/messages.js | 2 --
2 files changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1ed72b8c/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 e1e16f4..748cbc8 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,13 +589,6 @@ 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);
},
/**
@@ -1409,9 +1402,6 @@ 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/1ed72b8c/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 05e2179..c0e1e16 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1571,8 +1571,6 @@ 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',