ソースを参照

AMBARI-5087. If clicked on a separate window when on step 9 in the install wizard - it should resume. (Buzhor Denys via nechiporenko)

Oleg Nechiporenko 11 年 前
コミット
9432be8263

+ 0 - 3
ambari-web/app/controllers/wizard.js

@@ -517,9 +517,6 @@ App.WizardController = Em.Controller.extend({
 
   loadServicesFromServer: function () {
     var services = this.getDBProperty('service');
-    if (services) {
-//      return;
-    }
     var apiService = this.loadServiceComponents();
     this.set('content.services', apiService);
     this.setDBProperty('service',apiService);

+ 10 - 1
ambari-web/app/controllers/wizard/step6_controller.js

@@ -35,7 +35,16 @@ var lazyloading = require('utils/lazy_loading');
 App.WizardStep6Controller = Em.Controller.extend({
 
   hosts: [],
-
+  /**
+   * List of components info about selecting/deselecting status for components.
+   *
+   * @type {Array}
+   *  @item {Em.Object}
+   *    @property name {String} - component name
+   *    @property label {String} - component display name
+   *    @property allChecked {Boolean} - all checkboxes are checked
+   *    @property noChecked {Boolean} - no checkboxes checked
+   */
   headers: [],
 
   /**

+ 1 - 2
ambari-web/app/routes/installer.js

@@ -56,7 +56,6 @@ module.exports = Em.Route.extend({
                 if (!installerController.get('isStep9')) {
                   installerController.setCurrentStep('9');
                 }
-                App.db.data = currentClusterStatus.localdb;
                 router.transitionTo('step' + installerController.get('currentStep'));
                 break;
               case 'CLUSTER_INSTALLED_4' :
@@ -437,4 +436,4 @@ module.exports = Em.Route.extend({
 
   gotoStep10: Em.Router.transitionTo('step10')
 
-});
+});