ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [08/37] git commit: AMBARI-7459. Install Wizard hangs on Review page if go back from Install step to Choose Services. (jaimin)
Date Wed, 24 Sep 2014 20:53:07 GMT
AMBARI-7459. Install Wizard hangs on Review page if go back from Install step to Choose Services.
(jaimin)


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

Branch: refs/heads/branch-alerts-dev
Commit: 0680d1e5ca6e9d97919605c1cbe0c433cf2d1117
Parents: 2696c40
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Tue Sep 23 13:26:49 2014 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Tue Sep 23 13:26:55 2014 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/installer.js         | 20 +++++++++-----------
 .../app/controllers/wizard/step8_controller.js  |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0680d1e5/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index d933e9a..d6d6151 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/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);
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/0680d1e5/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 0607e9c..9f07df4 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/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


Mime
View raw message