Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

diff --git a/htsworkflow/frontend/bcmagic/utils.py b/htsworkflow/frontend/bcmagic/utils.py
index 6ffc99f8ee045a8a217c5be195386eee348deb84..5acc6ddefd6045473ad498c000ec60ae48f8b49c 100644 (file)
--- a/htsworkflow/frontend/bcmagic/utils.py
+++ b/htsworkflow/frontend/bcmagic/utils.py
@@ -5,7 +5,7 @@ import socket
 import StringIO
 
 
-def print_zpl(zpl_text, host):
+def print_zpl(zpl_text, host=settings.BCPRINTER_PRINTER1_HOST):
     """
     Sends zpl_text to printer
     """
@@ -15,7 +15,9 @@ def print_zpl(zpl_text, host):
     ftp.quit()
 
 
-def print_zpl_socket(zpl_text, host, port):
+def print_zpl_socket(zpl_text,
+                     host=settings.BCPRINTER_PRINTER1_HOST,
+                     port=settings.BCPRINTER_PRINTER1_PORT):
     """
     Sends zpl_text to printer via a socket
 

diff --git a/htsworkflow/frontend/templates/samples/library_detail.html b/htsworkflow/frontend/templates/samples/library_detail.html
index 771538c01cd1ca16414d37862351d9d8ebe9639c..c09a510aa5c676f23164ec631cd3f3a3b01b624c 100644 (file)
--- a/htsworkflow/frontend/templates/samples/library_detail.html
+++ b/htsworkflow/frontend/templates/samples/library_detail.html
@@ -33,7 +33,7 @@
       <td property="libns:date" content="{{result.run_date|date:'Y-m-d\TH:i:s'}}" datatype="xsd:dateTime">{{ result.run_date|date}}</td>
       <td>{{ result.cycle }}</td>
       <td><a href="{{result.flowcell.get_absolute_url}}"><span property="libns:flowcell_id">{{ result.flowcell_id }}</span></a>{% if user.is_staff %}<a href="{{result.flowcell.get_admin_url}}"><img class="icon_button" src="/media/img/admin/icon_changelink.gif" alt="Edit"/></a>{% endif%}</td>
-      <td><a href="{{result.lane.get_absolute_url}}" rel="libns:has_lane"><span property="libns:lane_number" datatype="xsd:decimal">{{ result.lane.lane_number }}</span></a></td>
+      <td>{{ result.lane.lane_number }}</td>
       <td><a href="{{ result.summary_url }}">Summary</a></td>
       <td><a href="{{ result.result_url }}">{{ result.result_label }}</a></td>
       <td>