Allow grabbing library information via json.

[htsworkflow.git] / htsworkflow / frontend / urls.py

diff --git a/htsworkflow/frontend/urls.py b/htsworkflow/frontend/urls.py
index 73a0a14f54c9f3193a6862bf019fbba4683760fb..e822fa15615ca525ba39fe1a2c9ca7e3f1e7410b 100644 (file)
--- a/htsworkflow/frontend/urls.py
+++ b/htsworkflow/frontend/urls.py
@@ -38,6 +38,8 @@ urlpatterns = patterns('',
     # library id to admin url
     (r'^library_id_to_admin_url/(?P<lib_id>\w+)/$',
      'htsworkflow.frontend.samples.views.library_id_to_admin_url'),
+    # sample / library information
+    (r'^samples/', include('htsworkflow.frontend.samples.urls')),                   
     # Raw result files
     (r'^results/(?P<flowcell_id>\w+)/(?P<cnm>C[1-9]-[0-9]+)/summary/',
       'htsworkflow.frontend.samples.views.summaryhtm_fc_cnm'),
@@ -54,14 +56,10 @@ urlpatterns = patterns('',
 )
 
 # 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 hasattr(admin.site, 'urls'):
+  urlpatterns += patterns('', (r'^admin/', include(admin.site.urls)))
+else:                          
+  urlpatterns += patterns('', (r'^admin/(.*)', admin.site.root))
 
 if settings.DEBUG:
   urlpatterns += patterns('',