incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-2729. While a host component is being installed (INSTALLING state), it does not show up in the Host Detail page. (Andrii Babiichuk via yusaku)
Date Thu, 25 Jul 2013 19:23:23 GMT
Updated Branches:
  refs/heads/trunk c5d7c0fbc -> 7d02e7375


AMBARI-2729. While a host component is being installed (INSTALLING state), it does not show
up in the Host Detail page. (Andrii Babiichuk via yusaku)


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

Branch: refs/heads/trunk
Commit: 7d02e73758a7d83caa5ca3290262a6c75b7bf1cf
Parents: c5d7c0f
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Thu Jul 25 12:23:13 2013 -0700
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Thu Jul 25 12:23:13 2013 -0700

----------------------------------------------------------------------
 ambari-web/app/templates/main/host/summary.hbs | 56 +++++++++++----------
 ambari-web/app/views/main/host/summary.js      | 16 +++---
 2 files changed, 37 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7d02e737/ambari-web/app/templates/main/host/summary.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/summary.hbs b/ambari-web/app/templates/main/host/summary.hbs
index a01bbc1..c309f7d 100644
--- a/ambari-web/app/templates/main/host/summary.hbs
+++ b/ambari-web/app/templates/main/host/summary.hbs
@@ -71,34 +71,36 @@
                       </li>
                     {{/if}}
                   {{/if}}
-                  {{#if view.isStart}}
-                    <li {{bindAttr class=" view.isDecommissioning:hidden view.noActionAvailable"}}>
-                      <a href="javascript:void(null)" data-toggle="modal" {{action "stopComponent"
view.content target="controller"}}>
-                        {{t common.stop}}
-                      </a>
-                    </li>
-                  {{/if}}
-                  {{#unless view.isStart}}
-                    <li {{bindAttr class="view.isUpgradeFailed:hidden view.isInstallFailed:hidden
view.isDecommissioning:hidden view.noActionAvailable"}}>
-                      <a href="javascript:void(null)" data-toggle="modal" {{action "startComponent"
view.content target="controller"}}>
-                        {{t common.start}}
-                      </a>
-                    </li>
+                  {{#unless view.isInstalling}}
+                    {{#if view.isStart}}
+                      <li {{bindAttr class=" view.isDecommissioning:hidden view.noActionAvailable"}}>
+                        <a href="javascript:void(null)" data-toggle="modal" {{action "stopComponent"
view.content target="controller"}}>
+                          {{t common.stop}}
+                        </a>
+                      </li>
+                    {{/if}}
+                    {{#unless view.isStart}}
+                      <li {{bindAttr class="view.isUpgradeFailed:hidden view.isInstallFailed:hidden
view.isDecommissioning:hidden view.noActionAvailable"}}>
+                        <a href="javascript:void(null)" data-toggle="modal" {{action "startComponent"
view.content target="controller"}}>
+                          {{t common.start}}
+                        </a>
+                      </li>
+                    {{/unless}}
+                    {{#if view.isUpgradeFailed}}
+                      <li {{bindAttr class="view.noActionAvailable"}}>
+                        <a href="javascript:void(null)" data-toggle="modal" {{action "upgradeComponent"
view.content target="controller"}}>
+                          {{t common.reUpgrade}}
+                        </a>
+                      </li>
+                    {{/if}}
+                    {{#if view.isInstallFailed}}
+                      <li {{bindAttr class="view.noActionAvailable"}}>
+                        <a href="javascript:void(null)" data-toggle="modal" {{action "installComponent"
view.content target="controller"}}>
+                          {{t common.reinstall}}
+                        </a>
+                      </li>
+                    {{/if}}
                   {{/unless}}
-                  {{#if view.isUpgradeFailed}}
-                    <li {{bindAttr class="view.noActionAvailable"}}>
-                      <a href="javascript:void(null)" data-toggle="modal" {{action "upgradeComponent"
view.content target="controller"}}>
-                        {{t common.reUpgrade}}
-                      </a>
-                    </li>
-                  {{/if}}
-                  {{#if view.isInstallFailed}}
-                    <li {{bindAttr class="view.noActionAvailable"}}>
-                      <a href="javascript:void(null)" data-toggle="modal" {{action "installComponent"
view.content target="controller"}}>
-                        {{t common.reinstall}}
-                      </a>
-                    </li>
-                  {{/if}}
                 </ul>
               </div>
               {{/if}}

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7d02e737/ambari-web/app/views/main/host/summary.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host/summary.js b/ambari-web/app/views/main/host/summary.js
index de7c509..897c473 100644
--- a/ambari-web/app/views/main/host/summary.js
+++ b/ambari-web/app/views/main/host/summary.js
@@ -95,14 +95,11 @@ App.MainHostSummaryView = Em.View.extend({
     var slaveComponents = [];
     var masterComponents = [];
     this.get('content.hostComponents').forEach(function (component) {
-      if (component.get('workStatus') != 'INSTALLING') {
-        if (component.get('isMaster')) {
-          masterComponents.push(component);
-        } else if (component.get('isSlave')) {
-          slaveComponents.push(component);
-        }
+      if (component.get('isMaster')) {
+        masterComponents.push(component);
+      } else if (component.get('isSlave')) {
+        slaveComponents.push(component);
       }
-
     }, this);
     return masterComponents.concat(slaveComponents);
   }.property('content', 'content.hostComponents.length'),
@@ -253,7 +250,7 @@ App.MainHostSummaryView = Em.View.extend({
     doBlinking: function () {
       var workStatus = this.get('workStatus');
       var self = this;
-      var pulsate = [ App.HostComponentStatus.starting, App.HostComponentStatus.stopping
].contains(workStatus);
+      var pulsate = [ App.HostComponentStatus.starting, App.HostComponentStatus.stopping,
App.HostComponentStatus.installing].contains(workStatus);
       if (!pulsate && this.get('isDataNode')) {
         var dataNodeComponent = this.get('content');
         if (dataNodeComponent && workStatus != "INSTALLED") {
@@ -281,6 +278,9 @@ App.MainHostSummaryView = Em.View.extend({
       return (this.get('workStatus') == App.HostComponentStatus.started || this.get('workStatus')
== App.HostComponentStatus.starting);
     }.property('workStatus'),
 
+    isInstalling: function () {
+      return (this.get('workStatus') == App.HostComponentStatus.installing);
+    }.property('workStatus'),
     /**
      * No action available while component is starting/stopping/unknown
      */


Mime
View raw message