Merge ssh://jumpgate.caltech.edu/var/htsworkflow/htsworkflow

diff --git a/htsworkflow/frontend/samples/models.py b/htsworkflow/frontend/samples/models.py
index de6fc11dc3d1bb407e43011a59128f8b3f733a4b..7ef895c2e2a8f8719e09a9f3ab81398de18194b1 100644 (file)
--- a/htsworkflow/frontend/samples/models.py
+++ b/htsworkflow/frontend/samples/models.py
@@ -148,6 +148,7 @@ class MultiplexIndex(models.Model):
     sequence = models.CharField(max_length=12, blank=True, null=True)
 
     class Meta:
+       verbose_name_plural = "multiplex indicies"
         unique_together = ('adapter_type', 'multiplex_id')
 
 class Library(models.Model):

diff --git a/htsworkflow/frontend/templates/samples/library_index.html b/htsworkflow/frontend/templates/samples/library_index.html
index 8751381aa1cb8ebf7d6ca428d45a6611de0f675a..8f351fedafef7d1405d6a3ba034c568ca1fad0e5 100644 (file)
--- a/htsworkflow/frontend/templates/samples/library_index.html
+++ b/htsworkflow/frontend/templates/samples/library_index.html
@@ -74,7 +74,7 @@
         <td ><a href="{{lib.library.get_absolute_url}}">{{ lib.amplified_from }}</a></td>
         <td ><a href="{{lib.library.get_absolute_url}}"><span property="libns:library_id">{{ lib.library_id }}</span></a></td>
         <td ><a href="{{lib.library.library_species.get_absolute_url}}" rel="libns:species"><span property="libns:species_name">{{ lib.species_name }}</span></a></td>
-        <td ><a href="{{ lib.library.get_absolute_url }}"><span property="libns:library_name">{{ lib.library_name }}</span></a></td>
+        <td ><a href="{{ lib.library.get_absolute_url }}"><span property="libns:name">{{ lib.library_name }}</span></a></td>
         <td  bgcolor="#00BFFF">{{ lib.lanes_run.0.0 }}</td>
         <td  bgcolor="#00BFFF">{{ lib.lanes_run.0.1 }}</td>
         <td  bgcolor="#00BFFF">{{ lib.lanes_run.0.2 }}</td>