From: Diane Trout Date: Wed, 1 Jun 2016 23:58:59 +0000 (-0700) Subject: give LaneOptions object access to the admin site X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=0b31f655d0e06f0d218d39bf5da75d5b6975698c give LaneOptions object access to the admin site Somewhere the changelist I was inheriting from needed a method from the admin site. (empty_value_display) --- diff --git a/experiments/views.py b/experiments/views.py index 4106634..d37836d 100644 --- a/experiments/views.py +++ b/experiments/views.py @@ -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 ) diff --git a/samples/views.py b/samples/views.py index 24ac92a..2080d5b 100644 --- a/samples/views.py +++ b/samples/views.py @@ -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,