Lorian's request for a thin comment field implemented.

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

diff --git a/htsworkflow/frontend/samples/admin.py b/htsworkflow/frontend/samples/admin.py
index ffdb5d844e82a0146cb4f89fa307bfd087da1c57..c7d543a65cb442c152237082d87f7fc9aeb46983 100644 (file)
--- a/htsworkflow/frontend/samples/admin.py
+++ b/htsworkflow/frontend/samples/admin.py
@@ -1,7 +1,16 @@
-from htsworkflow.frontend.samples.models import Antibody, Cellline, Condition, ExperimentType, Species, Affiliation, Library, Tag
 from django.contrib import admin
+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, 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
 
@@ -19,6 +28,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
@@ -60,14 +72,15 @@ class LibraryOptions(admin.ModelAdmin):
         'antibody',
         'cell_line',
         'condition',
-        'stopping_point')
+        'stopping_point',
+        'hidden')
     list_display_links = ('library_id', 'library_name',)
     fieldsets = (
       (None, {
         'fields': (
           ('library_id','library_name','hidden'),
           ('library_species'),
-          ('experiment_type', 'replicate'),
+          ('library_type', 'experiment_type', 'replicate'),
           ('cell_line','condition','antibody'),)
          }),
          ('Creation Information:', {
@@ -77,6 +90,21 @@ 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:
+    # formfield_overrids = {
+    #   models.ManyToMany: { 'widget': widgets.FilteredSelectMultiple }
+    # }
+    def formfield_for_dbfield(self, db_field, **kwargs):
+      if db_field.name == 'affiliations':
+        kwargs['widget'] = widgets.FilteredSelectMultiple(db_field.verbose_name, (db_field.name in self.filter_vertical))
+      rv = super(LibraryOptions, self).formfield_for_dbfield(db_field, **kwargs)
+      print db_field.name, kwargs
+      return rv
 
 class AffiliationOptions(admin.ModelAdmin):
     list_display = ('name','contact','email')
@@ -127,6 +155,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)