From 0747de45c9f785d98e1acfe272587fe1612fd1ca Mon Sep 17 00:00:00 2001 From: Brandon King Date: Wed, 19 Aug 2009 23:11:44 +0000 Subject: [PATCH] Finished removing bcprinter module by moving what little code there was to the bcmagic module. Removed app from settings. Fixed major bug that I just created (and fixed) that caused only admin views to work. --- htsworkflow/frontend/inventory/views.py | 2 +- htsworkflow/frontend/settings.py | 1 - htsworkflow/frontend/urls.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/htsworkflow/frontend/inventory/views.py b/htsworkflow/frontend/inventory/views.py index 0e48d55..d9d1b64 100644 --- a/htsworkflow/frontend/inventory/views.py +++ b/htsworkflow/frontend/inventory/views.py @@ -3,7 +3,7 @@ from htsworkflow.frontend.inventory.bcmagic import item_search from htsworkflow.frontend.bcmagic.plugin import register_search_plugin from htsworkflow.frontend.experiments.models import FlowCell from htsworkflow.frontend.bcmagic.forms import BarcodeMagicForm -from htsworkflow.frontend.bcmagic.util import print_zpl_socket +from htsworkflow.frontend.bcmagic.utils import print_zpl_socket from htsworkflow.frontend import settings #from htsworkflow.util.jsonutil import encode_json diff --git a/htsworkflow/frontend/settings.py b/htsworkflow/frontend/settings.py index d4f94a8..675da57 100644 --- a/htsworkflow/frontend/settings.py +++ b/htsworkflow/frontend/settings.py @@ -172,7 +172,6 @@ INSTALLED_APPS = ( 'htsworkflow.frontend.reports', 'htsworkflow.frontend.inventory', 'htsworkflow.frontend.bcmagic', - 'htsworkflow.frontend.bcprinter', 'django.contrib.databrowse', ) diff --git a/htsworkflow/frontend/urls.py b/htsworkflow/frontend/urls.py index 73a0a14..d08a75d 100644 --- a/htsworkflow/frontend/urls.py +++ b/htsworkflow/frontend/urls.py @@ -55,11 +55,11 @@ urlpatterns = patterns('', # Allow admin if django.VERSION >= (1, 1, 0, 'final', 0): - urlpatterns = patterns('', + urlpatterns += patterns('', (r'^admin/', include(admin.site.urls)), ) else: - urlpatterns = patterns('', + urlpatterns += patterns('', (r'^admin/(.*)', admin.site.root), ) -- 2.30.2