With 1.6 boolean field changed to default Null, so to be backwards compatible set...

[htsworkflow.git] / htsworkflow / frontend / samples / models.py

diff --git a/htsworkflow/frontend/samples/models.py b/htsworkflow/frontend/samples/models.py
index 7ef895c2e2a8f8719e09a9f3ab81398de18194b1..d7c70c239c037db3dd4fc77a8c67cc9cb5cb1678 100644 (file)
--- a/htsworkflow/frontend/samples/models.py
+++ b/htsworkflow/frontend/samples/models.py
@@ -1,3 +1,4 @@
+import types
 import logging
 import urlparse
 from django.db import models
@@ -128,7 +129,7 @@ class Affiliation(models.Model):
 
 class LibraryType(models.Model):
   name = models.CharField(max_length=255, unique=True,
-                          name="Adapter Type")
+                          verbose_name="Adapter Type")
   is_paired_end = models.BooleanField(default=True,
                     help_text="can you do a paired end run with this adapter")
   can_multiplex = models.BooleanField(default=True,
@@ -148,14 +149,14 @@ class MultiplexIndex(models.Model):
     sequence = models.CharField(max_length=12, blank=True, null=True)
 
     class Meta:
-       verbose_name_plural = "multiplex indicies"
+        verbose_name_plural = "multiplex indicies"
         unique_together = ('adapter_type', 'multiplex_id')
 
 class Library(models.Model):
   id = models.CharField(max_length=10, primary_key=True)
   library_name = models.CharField(max_length=100, unique=True)
   library_species = models.ForeignKey(Species)
-  hidden = models.BooleanField()
+  hidden = models.BooleanField(default=False)
   account_number = models.CharField(max_length=100, null=True, blank=True)
   cell_line = models.ForeignKey(Cellline, blank=True, null=True,
                                 verbose_name="Background")
@@ -206,7 +207,7 @@ class Library(models.Model):
       # note \u00b5 is the micro symbol in unicode
   successful_pM = models.DecimalField(max_digits=9,
                                       decimal_places=1, blank=True, null=True)
-  ten_nM_dilution = models.BooleanField()
+  ten_nM_dilution = models.BooleanField(default=False)
   gel_cut_size = models.IntegerField(default=225, blank=True, null=True)
   insert_size = models.IntegerField(blank=True, null=True)
   notes = models.TextField(blank=True)
@@ -280,6 +281,8 @@ class Library(models.Model):
       sequences = self.index_sequences()
       if sequences is None:
           return ""
+      if type(sequences) in types.StringTypes:
+          return sequences
       multiplex_ids = sequences.keys()
       multiplex_ids.sort()
       return seperator.join(( "%s:%s" %(i,sequences[i]) for i in multiplex_ids))