Fix urls patterns import to be compatible with django 1.6

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

diff --git a/htsworkflow/frontend/experiments/urls.py b/htsworkflow/frontend/experiments/urls.py
old mode 100755 (executable)
new mode 100644 (file)
index 67eabab..6a53cdb
--- a/htsworkflow/frontend/experiments/urls.py
+++ b/htsworkflow/frontend/experiments/urls.py
@@ -1,18 +1,13 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns('',
     (r'^$', 'htsworkflow.frontend.experiments.views.index'),
     #(r'^liblist$', 'htsworkflow.frontend.experiments.views.test_Libs'),
     #(r'^(?P<run_folder>.+)/$', 'gaworkflow.frontend.experiments.views.detail'),
-    (r'^config/(?P<fc_id>.+)/json', 'htsworkflow.frontend.experiments.experiments.flowcell_json'),
-    (r'^fcsheet/(?P<fcid>.+)/$', 'htsworkflow.frontend.experiments.views.makeFCSheet'),
-    (r'^updStatus$', 'htsworkflow.frontend.experiments.experiments.updStatus'),
-    (r'^getConfile$', 'htsworkflow.frontend.experiments.experiments.getConfile'),
-    (r'^getLanesNames$', 'htsworkflow.frontend.experiments.experiments.getLaneLibs'),
-    # for the following two URLS I have to pass in the primary key
-    # because I link to the page from an overridden version of the admin change_form
-    # which only makes the object primary key available in the form.
-    # (Or at least as far as I could tell)
+    (r'^config/(?P<fc_id>.+)/json$', 'htsworkflow.frontend.experiments.experiments.flowcell_json'),
+    (r'^lanes_for/(?P<username>.+)/json$', 'htsworkflow.frontend.experiments.experiments.lanes_for_json'),
+    (r'^file/(?P<key>.+)/?$', 'htsworkflow.frontend.experiments.views.read_result_file'),
     (r'^started/(?P<pk>.+)/$', 'htsworkflow.frontend.experiments.views.startedEmail'),
     (r'^finished/(?P<pk>.+)/$', 'htsworkflow.frontend.experiments.views.finishedEmail'),
+                        
 )