Explorar el Código

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

This reverts commit c569305894f513e3044bc0ecea2d23b55daccb12.
Yusaku Sako hace 9 años
padre
commit
1ed72b8c56

+ 0 - 10
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');
   },
 

+ 0 - 2
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',