You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/02/17 13:13:31 UTC

[2/2] git commit: AMBARI-4695 When in Decommissioned" state and Maint, icon shows orange, not medbag. (ababiichuk)

AMBARI-4695 When in Decommissioned" state and Maint, icon shows orange, not medbag. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 5cd82eb233ebf65876e5469677ff304732a7278f
Parents: cb9a6f3
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Feb 17 14:06:04 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Feb 17 14:06:23 2014 +0200

----------------------------------------------------------------------
 .../main/host/details/host_component_view.js    | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5cd82eb2/ambari-web/app/views/main/host/details/host_component_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host/details/host_component_view.js b/ambari-web/app/views/main/host/details/host_component_view.js
index cedfa79..8b26434 100644
--- a/ambari-web/app/views/main/host/details/host_component_view.js
+++ b/ambari-web/app/views/main/host/details/host_component_view.js
@@ -128,6 +128,21 @@ App.HostComponentView = Em.View.extend({
    * @type {String}
    */
   statusClass: function () {
+    //Class when install failed
+    if (this.get('workStatus') === App.HostComponentStatus.install_failed) {
+      return 'health-status-color-red icon-cog';
+    }
+
+    //Class when installing
+    if (this.get('workStatus') === App.HostComponentStatus.installing) {
+      return 'health-status-color-blue icon-cog';
+    }
+
+    //Class when maintenance
+    if (this.get('content.passiveState') != "ACTIVE") {
+      return 'icon-medkit';
+    }
+
     //If the component is DataNode
     if (this.get('isDataNode')) {
       if (this.get('isDataNodeRecommissionAvailable') && (this.get('isStart') || this.get('workStatus') == 'INSTALLED')) {
@@ -156,21 +171,6 @@ App.HostComponentView = Em.View.extend({
       }
     }
 
-    //Class when install failed
-    if (this.get('workStatus') === App.HostComponentStatus.install_failed) {
-      return 'health-status-color-red icon-cog';
-    }
-
-    //Class when installing
-    if (this.get('workStatus') === App.HostComponentStatus.installing) {
-      return 'health-status-color-blue icon-cog';
-    }
-
-    //Class when maintenance
-    if (this.get('content.passiveState') != "ACTIVE") {
-      return 'icon-medkit';
-    }
-
     //For all other cases
     return 'health-status-' + App.HostComponentStatus.getKeyName(this.get('workStatus'));