Refine user handling.

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

diff --git a/htsworkflow/frontend/samples/admin.py b/htsworkflow/frontend/samples/admin.py
index d686e21e1bf14875e0d7e0c0ada807d623e64958..deb61593d49dfbb13508d77c634b3096bc02a564 100644 (file)
--- a/htsworkflow/frontend/samples/admin.py
+++ b/htsworkflow/frontend/samples/admin.py
@@ -2,6 +2,7 @@ from django.contrib import admin
 from django.contrib.admin import widgets
 from django.contrib.admin.models import User
 from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
@@ -60,7 +61,18 @@ class ExperimentTypeOptions(admin.ModelAdmin):
   #list_display = ('name',)
   #fieldsets = ( (None, { 'fields': ('name',) }), )
 
-class HTSUserOptions(UserAdmin): pass
+class HTSUserCreationForm(UserCreationForm):
+    class Meta:
+        model = HTSUser
+        fields = ("username",'first_name','last_name')
+
+class HTSUserChangeForm(UserChangeForm):
+    class Meta:
+        model = HTSUser
+        
+class HTSUserOptions(UserAdmin):
+    form = HTSUserChangeForm
+    add_form = HTSUserCreationForm
 
 class LaneLibraryInline(admin.StackedInline):
   model = Lane
@@ -73,18 +85,23 @@ class LibraryTypeOptions(admin.ModelAdmin):
     model = LibraryType
 
 class LibraryOptions(admin.ModelAdmin):
+    class Media:
+        css = {
+            "all": ("css/wide_account_number.css",)
+            }
+        
     date_hierarchy = "creation_date"
     save_as = True
     save_on_top = True
     search_fields = (
-        'library_id',
+        'id',
         'library_name',
         'cell_line__cellline_name',
         'library_species__scientific_name',
         'library_species__common_name',
     )
     list_display = (
-        'library_id',
+        'id',
         #'aligned_reads',
         #'DataRun',
         'library_name',
@@ -115,17 +132,17 @@ class LibraryOptions(admin.ModelAdmin):
         'condition',
         'stopping_point',
         'hidden')
-    list_display_links = ('library_id', 'library_name',)
+    list_display_links = ('id', 'library_name',)
     fieldsets = (
       (None, {
         'fields': (
-          ('library_id','library_name','hidden'),
+          ('id','library_name','hidden'),
           ('library_species'),
           ('library_type', 'experiment_type', 'replicate'),
           ('cell_line','condition','antibody'),)
          }),
          ('Creation Information:', {
-             'fields' : (('made_for', 'made_by', 'creation_date'), ('stopping_point', 'amplified_from_sample'), ('avg_lib_size','undiluted_concentration', 'ten_nM_dilution', 'successful_pM'), 'notes',)
+             'fields' : (('made_for', 'made_by', 'creation_date'), ('stopping_point', 'amplified_from_sample'), ('avg_lib_size','undiluted_concentration', 'ten_nM_dilution', 'successful_pM'), 'account_number', 'notes',)
          }),
          ('Library/Project Affiliation:', {
              'fields' : (('affiliations'), ('tags'),)
@@ -138,13 +155,13 @@ class LibraryOptions(admin.ModelAdmin):
     # some post 1.0.2 version of django has formfield_overrides 
     # which would replace this code with:
     # formfield_overrids = {
-    #   models.ManyToMany: { 'widget': widgets.FilteredSelectMultiple }
-    # }
+    #    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))
+      if db_field.name in ('affiliations', 'tags'):
+        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 SpeciesOptions(admin.ModelAdmin):