Merge pull request #835 from oceanzus/redesign_sprint12_13280

Fixes missing Plot Types due to bug in 13254. (13280)
oceanobservatories · Mar 24, 2018 · 4aa3b59 · 4aa3b59
2 parents 8a99d3b + 8f6dc78
commit 4aa3b59
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/ooiui/static/js/partials/science/plot/PlotControls.html b/ooiui/static/js/partials/science/plot/PlotControls.html
@@ -48,9 +48,12 @@
                   <% plotModel.get('plotTypeOptions').each(function(option){ %>
                     <% //console.log(model.get('ref_des').indexOf('ZPLSC')); %>
                     <% //console.log(option.get('value')); %>
+                    <% //console.log((model.get('ref_des').indexOf('ZPLSC') > -1) && (option.get('value') == 'xy')); %>
                     <!-- TODO: Remove this ZPLSC-specific check once we can retrieve data from uframe correctly -->
                     <% if ((model.get('ref_des').indexOf('ZPLSC') > -1) && (option.get('value') == 'xy')){ %>
                       <option value="<%=option.get('value')%>" <%= option.get('value') == plotModel.get('plotType') ? 'selected' : ''%>><%= option.get('name') %></option>
+                    <% }else if ((model.get('ref_des').indexOf('ZPLSC') === -1)){ %>
+                      <option value="<%=option.get('value')%>" <%= option.get('value') == plotModel.get('plotType') ? 'selected' : ''%>><%= option.get('name') %></option>
                     <% } %>
                   <% }); %>
 

diff --git a/ooiui/static/json/uiPatchNotes.json b/ooiui/static/json/uiPatchNotes.json
@@ -1,4 +1,11 @@
 [
+    {
+        "VersionNumber": "1.4.8.1",
+        "VersionDate": "2018-03-23",
+        "VersionDescription": [
+            "Plotting: Fixes missing Plot Types due to bug in 13254. (13280)"
+        ]
+    },
     {
         "VersionNumber": "1.4.8",
         "VersionDate": "2018-01-19",