Start supporting multiple libraries per lane, as needed for the HiSeq

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

diff --git a/htsworkflow/frontend/urls.py b/htsworkflow/frontend/urls.py
index c9ce79b7e880f277422489bacc4799f477f493bb..23423dbd5c64bd654985fedf452d8b966f09fe4a 100644 (file)
--- a/htsworkflow/frontend/urls.py
+++ b/htsworkflow/frontend/urls.py
@@ -9,7 +9,7 @@ admin.autodiscover()
 #databrowse.site.register(Library)
 #databrowse.site.register(FlowCell)
 
-from htsworkflow.frontend import settings
+from django.conf import settings
 
 
 urlpatterns = patterns('',
@@ -26,9 +26,9 @@ urlpatterns = patterns('',
     # Experiments:
     (r'^experiments/', include('htsworkflow.frontend.experiments.urls')),
     # Flowcell:
-    (r'^flowcell/(?P<flowcell_id>\w+)/(?P<lane_number>\w+)/',
+    (r'^lane/(?P<lane_pk>\w+)',
      'htsworkflow.frontend.experiments.views.flowcell_lane_detail'),
-    (r'^flowcell/(?P<flowcell_id>\w+)/',
+    (r'^flowcell/(?P<flowcell_id>\w+)/((?P<lane_number>\w+)/)?$',
      'htsworkflow.frontend.experiments.views.flowcell_detail'),
     # AnalysTrack:
     #(r'^analysis/', include('htsworkflow.frontend.analysis.urls')),