Removing results tab from PS model. Addresses #585

sandialabs · Mar 3, 2016 · 8a2127d · 8a2127d
1 parent 8c7bcbb
commit 8a2127d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/web-server/plugins/slycat-parameter-image/js/wizard-ui.js b/web-server/plugins/slycat-parameter-image/js/wizard-ui.js
@@ -282,7 +282,7 @@ define(["slycat-server-root", "slycat-web-client", "slycat-dialog", "slycat-mark
           client.post_model_finish({
             mid: component.model._id(),
             success: function() {
-              component.tab(6);
+              component.go_to_model();
             }
           });
         },

diff --git a/web-server/plugins/slycat-parameter-image/wizard-ui.html b/web-server/plugins/slycat-parameter-image/wizard-ui.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-  <button type="button" class="close" data-bind="click: tab() != 6 ? cancel : false" data-dismiss="modal" aria-label="Close">
+  <button type="button" class="close" data-bind="click: cancel" data-dismiss="modal" aria-label="Close">
     <span aria-hidden="true">&times;</span>
   </button>
   <h3 class="modal-title">New Parameter Space Model</h3>
@@ -12,7 +12,6 @@ <h3 class="modal-title">New Parameter Space Model</h3>
     <li data-bind="css:{active:tab() == 3}, visible: ps_type() == 'remote'"><a>Select Table</a></li>
     <li data-bind="css:{active:tab() == 4}"><a>Select Columns</a></li>
     <li data-bind="css:{active:tab() == 5}"><a>Name Model</a></li>
-    <li data-bind="css:{active:tab() == 6}"><a>Results</a></li>
   </ul>
 
   <div class="tab-content">
@@ -64,10 +63,6 @@ <h3 class="modal-title">New Parameter Space Model</h3>
         <slycat-model-controls params="name:model.name,description:model.description,marking:model.marking"></slycat-model-controls>
       </form>
     </div>
-
-    <div data-bind="visible:tab() == 6">
-      <slycat-model-results params="{mid: model._id}"></slycat-model-results>
-    </div>
   </div>
 </div>
 <div class="modal-footer">
@@ -77,6 +72,5 @@ <h3 class="modal-title">New Parameter Space Model</h3>
   <button class="btn btn-primary" data-bind="visible:tab() == 2,click:connect,enable:remote.enable">Continue</button>
   <button class="btn btn-primary remote-browser-continue browser-continue" data-bind="visible:tab() == 3,click:load_table"><i class="fa fa-spinner fa-pulse"></i> Continue</button>
   <button class="btn btn-primary" data-bind="visible:tab() == 4,click:finish">Continue</button>
-  <button class="btn btn-primary" data-bind="visible:tab() == 5,click:name_model">Finish</button>
-  <button class="btn btn-primary" data-bind="visible:tab() == 6,click:go_to_model">Go To Model</button>
+  <button class="btn btn-primary" data-bind="visible:tab() == 5,click:name_model">Finish & Go To Model</button>
 </div>