From 76cba955f4f1236bda20552dcb66be83887018a8 Mon Sep 17 00:00:00 2001
From: "Timothy M. Shead" <tshead@sandia.gov>
Date: Wed, 20 May 2015 15:21:56 +0000
Subject: [PATCH] Handle legacy models without a "result" field gracefully in
 the client code.  Closes #430.

---
 web-server/js/slycat-navbar.js           | 4 ++--
 web-server/templates/slycat-project.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web-server/js/slycat-navbar.js b/web-server/js/slycat-navbar.js
index 954363a44..3b511fc7a 100644
--- a/web-server/js/slycat-navbar.js
+++ b/web-server/js/slycat-navbar.js
@@ -79,7 +79,7 @@ define("slycat-navbar", ["slycat-server-root", "slycat-web-client", "slycat-chan
           if(model.state() == "running")
             alerts.push({"type":"success", "message":"The model is being computed.  Patience!", "detail":null})
 
-          if(model.result() == "failed")
+          if(model.result && model.result() == "failed")
             alerts.push({"type":"danger", "message":"Model failed to build.  Here's what was happening when things went wrong:", "detail": model.message()})
         }
 
@@ -326,7 +326,7 @@ define("slycat-navbar", ["slycat-server-root", "slycat-web-client", "slycat-chan
               <!-- ko foreach: finished_models --> \
                 <li> \
                   <a data-bind="attr:{href:$parent.server_root + \'models/\' + $data._id()},popover:{trigger:\'hover\',content:$data.message()}"> \
-                    <button type="button" class="btn btn-default btn-xs" data-bind="click:$parent.close_model,clickBubble:false,css:{\'btn-success\':$data.result()===\'succeeded\',\'btn-danger\':$data.result()!==\'succeeded\'}"><span class="fa fa-check"></span></button> \
+                    <button type="button" class="btn btn-default btn-xs" data-bind="click:$parent.close_model,clickBubble:false,css:{\'btn-success\':$data.result && $data.result()===\'succeeded\',\'btn-danger\':$data.result && $data.result()!==\'succeeded\'}"><span class="fa fa-check"></span></button> \
                     <span data-bind="text:name"></span> \
                   </a> \
                 </li> \
diff --git a/web-server/templates/slycat-project.html b/web-server/templates/slycat-project.html
index 55eebe9fc..60b0464a7 100644
--- a/web-server/templates/slycat-project.html
+++ b/web-server/templates/slycat-project.html
@@ -27,7 +27,7 @@ <h3>Models</h3>
               <span class="label label-default" data-bind="text:$data['model-type']() + ' model'"></span>
               <strong data-bind="text:name"></strong>
               <div class="pull-right" style="display: inline-block" data-bind="html:$parent.badge($data.marking())"></div>
-              <span class="label label-danger" data-bind="visible:result() == 'failed',popover:{placement:'right', trigger:'hover', content:message}">Failed</span>
+              <span class="label label-danger" data-bind="visible:$data.result && $data.result() == 'failed',popover:{placement:'right', trigger:'hover', content:message}">Failed</span>
               <p>
                 <small>
                   <span data-bind="text:description"></span>