You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2013/11/04 20:47:08 UTC

git commit: AMBARI-3684. Add Clients opens 10 Background Operations popups instead of one. (akovalenko)

Updated Branches:
  refs/heads/trunk d2bba601b -> c288fa434


AMBARI-3684. Add Clients opens 10 Background Operations popups instead of one. (akovalenko)


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

Branch: refs/heads/trunk
Commit: c288fa43445a797bb7f753208f9d33961c8039fd
Parents: d2bba60
Author: Aleksandr Kovalenko <ol...@ukr.net>
Authored: Mon Nov 4 21:46:31 2013 +0200
Committer: Aleksandr Kovalenko <ol...@ukr.net>
Committed: Mon Nov 4 21:46:31 2013 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/host/details.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c288fa43/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index ae24b7e..b8d89be 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -405,22 +405,22 @@ App.MainHostDetailsController = Em.Controller.extend({
             // Clients component has many sub-components which
             // need to be installed.
             var scs = component.get('subComponentNames');
-            scs.forEach(function (sc) {
+            scs.forEach(function (sc, index) {
               var c = Em.Object.create({
                 displayName: App.format.role(sc),
                 componentName: sc
               });
-              self.primary(c);
+              self.primary(c, scs.length - index === 1);
             });
           } else {
-            self.primary(component);
+            self.primary(component, true);
           }
         }
       });
     }
   },
 
-  primary: function(component) {
+  primary: function(component, showPopup) {
     var self = this;
     var componentName = component.get('componentName').toUpperCase().toString();
     var displayName = component.get('displayName');
@@ -471,7 +471,7 @@ App.MainHostDetailsController = Em.Controller.extend({
               App.router.get('clusterController').loadUpdatedStatusDelayed(500);
             }
 
-            if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
+            if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked() && showPopup) {
               App.router.get('backgroundOperationsController').showPopup();
             }
           });