ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject git commit: AMBARI-6696. add service always highlights ATS component (Buzhor Denys via alexantonenko)
Date Thu, 31 Jul 2014 14:47:22 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 48f97d399 -> 9f1318585


AMBARI-6696. add service always highlights ATS component (Buzhor Denys via alexantonenko)


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

Branch: refs/heads/trunk
Commit: 9f1318585eb003581139b33d6e0f20fb152da621
Parents: 48f97d3
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Thu Jul 31 17:42:15 2014 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Thu Jul 31 17:42:15 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9f131858/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index c996d56..fcccf33 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -974,9 +974,12 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, {
    */
   loadMasterComponentHosts: function () {
     var masterComponentHosts = this.getDBProperty('masterComponentHosts');
+    var stackMasterComponents = App.get('components.masters').concat(App.get('components.masterBehavior')).uniq();
     if (!masterComponentHosts) {
       masterComponentHosts = [];
-      App.HostComponent.find().filterProperty('isMaster', true).forEach(function (item) {
+      App.HostComponent.find().filter(function(component) {
+        return stackMasterComponents.contains(component.get('componentName'));
+      }).forEach(function (item) {
         masterComponentHosts.push({
           component: item.get('componentName'),
           hostName: item.get('hostName'),


Mime
View raw message