svn commit: r1495515 - in /incubator/ambari/branches/branch-1.2.4/ambari-web/app: models/service.js views/common/quick_view_link_view.js

[jaimin]

Author: jaimin
Date: Fri Jun 21 17:36:25 2013
New Revision: 1495515

URL: http://svn.apache.org/r1495515
Log:
AMBARI-2459. HBase health status incorrectly showing down (red) when HBase 
master is up. (jaimin)

Modified:
    incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service.js
    
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/common/quick_view_link_view.js

Modified: 
incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service.js
URL: 
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service.js?rev=1495515&r1=1495514&r2=1495515&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service.js 
(original)
+++ incubator/ambari/branches/branch-1.2.4/ambari-web/app/models/service.js Fri 
Jun 21 17:36:25 2013
@@ -65,7 +65,7 @@ App.Service = DS.Model.extend({
       this.set('healthStatus', 'red-blinking');
     }
 
-    if (this.get('serviceName') === 'HBASE') {
+    if (this.get('serviceName') === 'HBASE' && 
App.supports.multipleHBaseMasters) {
       var active = this.get('hostComponents').findProperty('haStatus', 
'active');
       if (!active) {
         this.set('healthStatus', 'red');

Modified: 
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/common/quick_view_link_view.js
URL: 
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/common/quick_view_link_view.js?rev=1495515&r1=1495514&r2=1495515&view=diff
==============================================================================
--- 
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/common/quick_view_link_view.js
 (original)
+++ 
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/common/quick_view_link_view.js
 Fri Jun 21 17:36:25 2013
@@ -33,8 +33,13 @@ App.QuickViewLinks = Em.View.extend({
     } else if (serviceName === 'MAPREDUCE') {
       host = components.findProperty('componentName', 
'JOBTRACKER').get('host.publicHostName');
     } else if (serviceName === 'HBASE') {
-      var component = components.filterProperty('componentName', 
'HBASE_MASTER').findProperty('haStatus', 'active');
-      if(component){
+      var component;
+      if (App.supports.multipleHBaseMasters) {
+         component = components.filterProperty('componentName', 
'HBASE_MASTER').findProperty('haStatus', 'active');
+      } else {
+         component = components.findProperty('componentName', 'HBASE_MASTER');
+      }
+      if (component) {
         host = component.get('host.publicHostName');
       }
     }