give LaneOptions object access to the admin site
authorDiane Trout <diane@ghic.org>
Wed, 1 Jun 2016 23:58:59 +0000 (16:58 -0700)
committerDiane Trout <diane@ghic.org>
Fri, 24 Jun 2016 22:55:58 +0000 (15:55 -0700)
Somewhere the changelist I was inheriting from needed a method from the
admin site. (empty_value_display)

experiments/views.py
samples/views.py

index 410663498e0d247c1c9aa7f0161ce89d0b884945..d37836d7de8af143ebee7bc911e05f72167f5445 100644 (file)
@@ -6,6 +6,7 @@ import os
 
 #from django.template import Context, loader
 #shortcut to the above modules
+from django.contrib.admin.sites import site as default_admin_site
 from django.contrib.auth.decorators import user_passes_test
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -207,7 +208,7 @@ def lanes_for(request, username=None):
                                      'library__library_species'],
                         search_fields=['flowcell__flowcell_id', 'library__id', 'library__library_name'],
                         list_per_page=200,
-                        model_admin=LaneOptions(Lane, None),
+                        model_admin=LaneOptions(Lane, default_admin_site),
                         extra_filters=query
                         )
 
index 24ac92a9c4a1d26c3cce4473bc1587d6eaae22cb..2080d5bce43a1705761e4badade1829dd4851f4a 100644 (file)
@@ -5,6 +5,7 @@ import logging
 import os
 import json
 
+from django.contrib.admin.sites import site as admin_site
 from django.views.decorators.csrf import csrf_exempt
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, get_object_or_404
@@ -43,7 +44,7 @@ def library(request, todo_only=False):
                         list_filter=['affiliations', 'library_species'],
                         search_fields=['id', 'library_name', 'amplified_from_sample__id'],
                         list_per_page=200,
-                        model_admin=LibraryOptions(Library, None),
+                        model_admin=LibraryOptions(Library, admin_site),
                         )
 
     context = {'cl': fcl,