New Lane Table migration progress.

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

diff --git a/htsworkflow/frontend/samples/admin.py b/htsworkflow/frontend/samples/admin.py
index 643413fb8b2d9a2fbb494353b564d6bcf7b6c341..1e01c88ecaaac214345fd1d3eff9c46f19714219 100644 (file)
--- a/htsworkflow/frontend/samples/admin.py
+++ b/htsworkflow/frontend/samples/admin.py
@@ -3,7 +3,12 @@ from django.contrib.admin import widgets
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from htsworkflow.frontend.samples.models import Antibody, Cellline, Condition, ExperimentType, Species, Affiliation, Library, Tag
+from htsworkflow.frontend.samples.models import Antibody, Cellline, Condition, ExperimentType, LibraryType, Species, Affiliation, Library, Tag
+from htsworkflow.frontend.experiments.models import Lane
+
+class LaneLibraryInline(admin.StackedInline):
+  model = Lane
+  extra = 0
 
 class Library_Inline(admin.TabularInline):
   model = Library
@@ -22,6 +27,9 @@ class ExperimentTypeOptions(admin.ModelAdmin):
   #list_display = ('name',)
   #fieldsets = ( (None, { 'fields': ('name',) }), )
 
+class LibraryTypeOptions(admin.ModelAdmin):
+    model = LibraryType
+
 class LibraryOptions(admin.ModelAdmin):
     date_hierarchy = "creation_date"
     save_as = True
@@ -71,7 +79,7 @@ class LibraryOptions(admin.ModelAdmin):
         'fields': (
           ('library_id','library_name','hidden'),
           ('library_species'),
-          ('experiment_type', 'replicate'),
+          ('library_type', 'experiment_type', 'replicate'),
           ('cell_line','condition','antibody'),)
          }),
          ('Creation Information:', {
@@ -81,6 +89,9 @@ class LibraryOptions(admin.ModelAdmin):
              'fields' : (('affiliations'), ('tags'),)
          }),
          )
+    inlines = [
+      LaneLibraryInline,
+    ]
 
     # some post 1.0.2 version of django has formfield_overrides 
     # which would replace this code with:
@@ -143,6 +154,7 @@ admin.site.register(Antibody, AntibodyOptions)
 admin.site.register(Cellline, CelllineOptions)
 admin.site.register(Condition, ConditionOptions)
 admin.site.register(ExperimentType, ExperimentTypeOptions)
+admin.site.register(LibraryType, LibraryTypeOptions)
 admin.site.register(Library, LibraryOptions)
 admin.site.register(Species, SpeciesOptions)
 admin.site.register(Tag, TagOptions)