change task view to determine alive and health state by contents of t…

…he HealthCheckResult rather than its existence
d2iq-archive · Jan 27, 2015 · 3ec8f59 · 3ec8f59 · sttts · Jan 27, 2015
1 parent 3f1eabe
commit 3ec8f59
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/resources/assets/js/components/TaskHealthComponent.jsx b/src/main/resources/assets/js/components/TaskHealthComponent.jsx
@@ -49,9 +49,9 @@ var TaskHealthComponent = React.createClass({
                   <dd className="text-muted">None</dd> :
                   <dd>{cResult.consecutiveFailures}</dd>}
                 <dt>Alive</dt>
-                {cResult.alive == null ?
-                  <dd>No</dd> :
-                  <dd>Yes</dd>}
+                {cResult.alive ?
+                  <dd>Yes</dd> :
+                  <dd>No</dd>}
               </dl>
             </div>
           );

diff --git a/src/main/resources/assets/js/models/Task.js b/src/main/resources/assets/js/models/Task.js
@@ -27,7 +27,7 @@ var Task = Backbone.Model.extend({
     var healthCheckResults = this.get("healthCheckResults");
     if (healthCheckResults != null) {
       health = healthCheckResults.every(function (hcr) {
-        if (hcr) {
+        if (hcr.firstSuccess) {
           nullResult = false;
           return hcr.alive;
         } else { // might be null