postpone gridftp initialization (magical fix of uwsgi issues)

[qcg-portal.git] / qcg / urls.py

diff --git a/qcg/urls.py b/qcg/urls.py
index 085bfd3..798950b 100644 (file)
--- a/qcg/urls.py
+++ b/qcg/urls.py
@@ -1,15 +1,23 @@
-from django.conf.urls import patterns, url, include
+from django.conf import settings
+from django.conf.urls import patterns, url
 
 from qcg import views
 
+login_url = url(r'^login/', 'django.contrib.auth.views.login', {'template_name': 'admin/login.html'}, name='login') \
+    if settings.DEBUG else url(r'^openid/login/', views.openid_begin, name='login')
+
 urlpatterns = patterns('',
-    url(r'^openid/login/', views.openid_begin, name='openid-login'),
+    login_url,
     url(r'^openid/complete/', 'django_openid_auth.views.login_complete', name='openid-complete'),
     url(r'^openid/logout/', 'django.contrib.auth.views.logout', {'template_name': 'qcg/logout.html'}, name='logout'),
 
     url(r'^$', views.index, name='index'),
     url(r'^jobs/$', views.jobs_list, name='jobs'),
-    url(r'^job/new/$', views.job_new, name='job_new'),
+    url(r'^job/submit/$', views.job_submit, name='job_submit'),
     url(r'^job/(?P<job_id>[\w]+)/?$', views.job_details, name='job'),
     url(r'^job/(?P<job_id>[\w]+)/(?P<task_id>[\w]+)/?$', views.task_details, name='task'),
+
+    url(r'^gridftp/$', views.gridftp, name='gridftp'),
+
+    url(r'^gridftp/upload/$', views.gridftp_upload, name='gridftp_upload'),
 )