This is a partial merge of the stanford branch with the caltech branch of

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

diff --git a/htsworkflow/frontend/analysis/models.py b/htsworkflow/frontend/analysis/models.py
index 301be2721c891112438156042c6eee48b7782593..4b1c72d1d0b1faa9af538a622f0e69ab3dafc3be 100644 (file)
--- a/htsworkflow/frontend/analysis/models.py
+++ b/htsworkflow/frontend/analysis/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from datetime import datetime
-from htswfrontend.fctracker.models import Library 
+from htsworkflow.frontend.samples.models import Library 
 from string import *
 
 class Task(models.Model):
@@ -20,7 +20,7 @@ class Task(models.Model):
   ## userid = # logged in user
   task_status = models.CharField(max_length=500,blank=True,null=True,default='defined')
   results_location = models.CharField(max_length=2000,blank=True,null=True) 
-  submitted_on = models.DateTimeField(core=True,default=datetime.now())
+  submitted_on = models.DateTimeField(default=datetime.now())
   run_note = models.CharField(max_length=500,blank=True,null=True)
   
   def __str__(self):