Pārlūkot izejas kodu

AMBARI-7459. Install Wizard hangs on Review page if go back from Install step to Choose Services. (jaimin)

Jaimin Jetly 10 gadi atpakaļ
vecāks
revīzija
0680d1e5ca

+ 9 - 11
ambari-web/app/controllers/installer.js

@@ -530,18 +530,16 @@ App.InstallerController = App.WizardController.extend({
    */
   saveClients: function (stepController) {
     var clients = [];
-    var serviceComponents = App.StackServiceComponent.find();
-    var services =
-      stepController.get('content').filterProperty('isSelected', true).forEach(function (_service) {
-        var client = _service.get('serviceComponents').filterProperty('isClient', true);
-        client.forEach(function (clientComponent) {
-          clients.pushObject({
-            component_name: clientComponent.get('componentName'),
-            display_name: clientComponent.get('displayName'),
-            isInstalled: false
-          });
-        }, this);
+    stepController.get('content').filterProperty('isSelected', true).forEach(function (_service) {
+      var client = _service.get('serviceComponents').filterProperty('isClient', true);
+      client.forEach(function (clientComponent) {
+        clients.pushObject({
+          component_name: clientComponent.get('componentName'),
+          display_name: clientComponent.get('displayName'),
+          isInstalled: false
+        });
       }, this);
+    }, this);
     this.setDBProperty('clientInfo', clients);
     this.set('content.clients', clients);
   },

+ 1 - 1
ambari-web/app/controllers/wizard/step8_controller.js

@@ -143,7 +143,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, {
    */
   selectedServices: function () {
     return this.get('content.services').filterProperty('isSelected', true).filterProperty('isInstalled', false);
-  }.property('content.services').cacheable(),
+  }.property('content.services.@each.isSelected','content.services.@each.isInstalled').cacheable(),
 
   /**
    * List of installed and selected services