Admin compatibility for changes in Django >= 1.1.

diff --git a/htsworkflow/frontend/bcmagic/utils.py b/htsworkflow/frontend/bcmagic/utils.py
index 5ee81a95401c485ebe815af2127ea651bf0378f7..ee35268dbc85d4156c19f6903130a3427d761aa6 100644 (file)
--- a/htsworkflow/frontend/bcmagic/utils.py
+++ b/htsworkflow/frontend/bcmagic/utils.py
@@ -1,4 +1,30 @@
+from htsworkflow.frontend import settings
 
+import ftplib
+import socket
+import StringIO
+
+
+def print_zpl(zpl_text, host=settings.BCPRINTER_PRINTER1_HOST):
+    """
+    Sends zpl_text to printer
+    """
+    ftp = ftplib.FTP(host=host, user='blank', passwd='')
+    ftp.login()
+    ftp.storlines("STOR printme.txt", StringIO.StringIO(zpl_text))
+    ftp.quit()
+    
+
+def print_zpl_socket(zpl_text, host=settings.BCPRINTER_PRINTER1_HOST, port=settings.BCPRINTER_PRINTER1_PORT):
+    """
+    Sends zpl_text to printer via a socket
+    """
+    s = socket.socket()
+    # PORT 9100 is default for Zebra tabletop/desktop printers
+    # PORT 6101 is default for Zebra mobile printers
+    s.connect((host, port))
+    s.sendall(zpl_text)
+    s.close()
 
 def report_error(message):
     """

diff --git a/htsworkflow/frontend/inventory/views.py b/htsworkflow/frontend/inventory/views.py
index 027c4aaa4cbdade50a7e9b465e498757ee661d27..cb2fca68fe94a1bf337f99a79e6dfbc6c9a74849 100644 (file)
--- a/htsworkflow/frontend/inventory/views.py
+++ b/htsworkflow/frontend/inventory/views.py
@@ -27,6 +27,7 @@ INVENTORY_CONTEXT_DEFAULTS = {
 }
 
 INVENTORY_ITEM_PRINT_DEFAULTS = {
+    'Hard Drive': 'inventory/hard_drive_shell.zpl',
     'default': 'inventory/default.zpl',
     'host': settings.BCPRINTER_PRINTER1_HOST
 }

diff --git a/htsworkflow/frontend/urls.py b/htsworkflow/frontend/urls.py
index abd8cd794665929895e32f6c472ff7c859830edb..73a0a14f54c9f3193a6862bf019fbba4683760fb 100644 (file)
--- a/htsworkflow/frontend/urls.py
+++ b/htsworkflow/frontend/urls.py
@@ -1,5 +1,6 @@
 from django.conf.urls.defaults import *
 from django.contrib import admin
+import django
 admin.autodiscover()
 
 # Databrowser:
@@ -10,6 +11,7 @@ admin.autodiscover()
 
 from htsworkflow.frontend import settings
 
+
 urlpatterns = patterns('',
     ('^accounts/login/$', 'django.contrib.auth.views.login'),
     ('^accounts/logout/$', 'django.contrib.auth.views.logout'),
@@ -19,8 +21,8 @@ urlpatterns = patterns('',
     ('^accounts/profile/$', 'htsworkflow.frontend.samples.views.user_profile'),
     # Base:
     (r'^eland_config/', include('htsworkflow.frontend.eland_config.urls')),
-    # Admin:
-    (r'^admin/(.*)', admin.site.root),
+    ### MOVED Admin from here ###
+    #(r'^admin/(.*)', admin.site.root),
     # Experiments:
     (r'^experiments/', include('htsworkflow.frontend.experiments.urls')),
     # AnalysTrack:
@@ -51,6 +53,16 @@ urlpatterns = patterns('',
     #(r'^databrowse/(.*)', databrowse.site.root)
 )
 
+# Allow admin
+if django.VERSION >= (1, 1, 0, 'final', 0):
+  urlpatterns = patterns('',
+    (r'^admin/', include(admin.site.urls)),
+  )
+else:
+  urlpatterns = patterns('',
+    (r'^admin/(.*)', admin.site.root),
+  )
+
 if settings.DEBUG:
   urlpatterns += patterns('',
       (r'^static/(?P<path>.*)$', 'django.views.static.serve',