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.

diff --git a/htsworkflow/frontend/inventory/views.py b/htsworkflow/frontend/inventory/views.py
index 0e48d5552b1013fc8f9afa626ac693094c8c96de..d9d1b6419d7972212722cf6ce229743c07926d08 100644 (file)
--- 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 d4f94a8e3771a0d2d38696e1bed41a6f4a65ba3c..675da571863af24483f254b7f2ec5dbf38398751 100644 (file)
--- 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 73a0a14f54c9f3193a6862bf019fbba4683760fb..d08a75d66fdfdcebbbad8dd3573f594fe8009c05 100644 (file)
--- 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),
   )