ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject ambari git commit: Revert "AMBARI-14406. Display A Dialog When Beginning An Upgrade.(xiwang)"
Date Thu, 17 Dec 2015 16:02:56 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 211c2dd6e -> fe999d740


Revert "AMBARI-14406. Display A Dialog When Beginning An Upgrade.(xiwang)"

This reverts commit 211c2dd6ee5fc45124e69a73db1ae499815a8b52.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fe999d74
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fe999d74
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fe999d74

Branch: refs/heads/branch-2.2
Commit: fe999d740499d08c9daeb30b2d06fe7737ecc96a
Parents: 211c2dd
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Thu Dec 17 08:02:42 2015 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Thu Dec 17 08:02:42 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/fe999d74/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 00dbe82..f77397b 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
@@ -596,13 +596,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);
   },
 
   /**
@@ -1398,9 +1391,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/fe999d74/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 93f2ce6..1ad0f6a 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1581,8 +1581,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',


Mime
View raw message