django-nose didn't work with django 1.1, so I went back to the nose plugin NoseDjango

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

diff --git a/htsworkflow/frontend/urls.py b/htsworkflow/frontend/urls.py
index 1cd34b4f83d5fcb56ee4795e93c5cc4d29e4e123..8cdb82c83936fb1c0859765d9bf09b3d31c1ef65 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:
@@ -8,7 +9,8 @@ admin.autodiscover()
 #databrowse.site.register(Library)
 #databrowse.site.register(FlowCell)
 
-from htsworkflow.frontend import settings
+from django.conf import settings
+
 
 urlpatterns = patterns('',
     ('^accounts/login/$', 'django.contrib.auth.views.login'),
@@ -19,26 +21,36 @@ 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')),
+    # Flowcell:
+    (r'^flowcell/(?P<flowcell_id>\w+)/(?P<lane_number>\w+)/',
+     'htsworkflow.frontend.experiments.views.flowcell_lane_detail'),
+    (r'^flowcell/(?P<flowcell_id>\w+)/',
+     'htsworkflow.frontend.experiments.views.flowcell_detail'),
     # AnalysTrack:
     #(r'^analysis/', include('htsworkflow.frontend.analysis.urls')),
-    # Report Views:
+    # Inventory urls
     (r'^inventory/', include('htsworkflow.frontend.inventory.urls')),
+    # Report Views:
     (r'^reports/', include('htsworkflow.frontend.reports.urls')),
     # Library browser
     (r'^library/$', 'htsworkflow.frontend.samples.views.library'),
     (r'^library/(?P<lib_id>\w+)/$', 
       'htsworkflow.frontend.samples.views.library_to_flowcells'),
+    (r'^lanes_for/$', 'htsworkflow.frontend.samples.views.lanes_for'),
+    (r'^lanes_for/(?P<username>\w+)', 'htsworkflow.frontend.samples.views.lanes_for'),
     # 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/',
+    (r'^results/(?P<flowcell_id>\w+)/(?P<cnm>C[0-9]+-[0-9]+)/summary/',
       'htsworkflow.frontend.samples.views.summaryhtm_fc_cnm'),
-    (r'^results/(?P<flowcell_id>\w+)/(?P<cnm>C[1-9]-[0-9]+)/eland_result/(?P<lane>[1-8])',
+    (r'^results/(?P<flowcell_id>\w+)/(?P<cnm>C[0-9]+-[0-9]+)/eland_result/(?P<lane>[1-8])',
       'htsworkflow.frontend.samples.views.result_fc_cnm_eland_lane'),
     (r'^results/(?P<fc_id>\w+)/(?P<cnm>C[1-9]-[0-9]+)/bedfile/(?P<lane>[1-8])/ucsc',
       'htsworkflow.frontend.samples.views.bedfile_fc_cnm_eland_lane_ucsc'),
@@ -50,6 +62,12 @@ urlpatterns = patterns('',
     #(r'^databrowse/(.*)', databrowse.site.root)
 )
 
+# Allow admin
+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('',
       (r'^static/(?P<path>.*)$', 'django.views.static.serve',