added Affiliation FK to Libarary + Affiliation table to associate each library record...

diff --git a/htswfrontend/htswfrontend/fctracker/models.py b/htswfrontend/htswfrontend/fctracker/models.py
index 3ca4ac13421c0aa011534eb9c5b2f49ace74291f..a31582f1fca7c640644c6778496b4d2669a8e7d1 100644 (file)
--- a/htswfrontend/htswfrontend/fctracker/models.py
+++ b/htswfrontend/htswfrontend/fctracker/models.py
@@ -187,10 +187,10 @@ class Library(models.Model):
     date_hierarchy = "creation_date"
     save_as = True
     save_on_top = True
-    search_fields = ['affiliation','library_name', 'library_id','made_by','made_for','antibody__antigene','antibody__catalog','antibody__antibodies','antibody__source','cell_line__cellline_name','library_species__scientific_name','library_species__common_name','library_species__use_genome_build']
+    search_fields = ['affiliations__name','affiliations__contact','library_name', 'library_id','made_by','made_for','antibody__antigene','antibody__catalog','antibody__antibodies','antibody__source','cell_line__cellline_name','library_species__scientific_name','library_species__common_name','library_species__use_genome_build']
     list_display = ('affiliation','library_id', 'library_name','experiment_type','replicate','antibody_name','cell_line','made_by','creation_date')
     list_display_links = ('library_id', 'library_name')
-    list_filter = ('experiment_type','library_species','made_for', 'made_by','replicate')
+    list_filter = ('experiment_type','affiliations','library_species','made_for', 'made_by','replicate')
     fields = (
         (None, {
             'fields': (('replicate','library_id','library_name'),('library_species'),('experiment_type'),('cell_line','condition','antibody'),)