Merge branch 'release_1.82.1'

IUBLibTech · May 18, 2018 · 783a4d8 · 783a4d8
2 parents 4ba409d + 041add7
commit 783a4d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/app/views/search/show.xls.erb b/app/views/search/show.xls.erb
@@ -34,7 +34,8 @@
     </Table>
   </Worksheet>
             <% end %>
-         <% @media_format = po.format %>
+         <%# Excel worksheet names exclude some characters and have 31-char max %>
+         <% @media_format = po.format.gsub(/[?:*\/\\\[\]]/, '_')[0,31] %>
   <Worksheet ss:Name="<%= @media_format %>">
     <Table>
         <% @metadata_headers = [] %>

diff --git a/app/views/shipments/reload.html.erb b/app/views/shipments/reload.html.erb
@@ -34,3 +34,7 @@
     </div>
   </div>
 </div>
+<script type="text/javascript">
+  //set barcode focus, only if no warning div content was set
+  if (!$.trim($("div.warning").html())) { $("#mdpi_barcode").focus() };
+</script>
diff --git a/app/views/shipments/unload.html.erb b/app/views/shipments/unload.html.erb
@@ -34,3 +34,7 @@
     </div>
   </div>
 </div>
+<script type="text/javascript">
+  //set barcode focus, only if no warning div content was set
+  if (!$.trim($("div.warning").html())) { $("#mdpi_barcode").focus() };
+</script>