From: Maciej Tronowski Date: Fri, 11 Sep 2015 08:40:05 +0000 (+0200) Subject: strictly match and of url for login views X-Git-Tag: v1.1~7 X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=9e5d054782024094df0e880f5d52e8106b1fd8cb;p=qcg-portal.git strictly match and of url for login views --- diff --git a/qcg/urls.py b/qcg/urls.py index f78447d..5fbed87 100644 --- a/qcg/urls.py +++ b/qcg/urls.py @@ -3,13 +3,13 @@ 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') +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('', 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'^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'), @@ -29,6 +29,5 @@ urlpatterns = patterns('', url(r'^job/(?P[\w]+)/(?P[\w]+)/?$', views.task_details, name='task'), url(r'^gridftp/$', views.gridftp, name='gridftp'), - url(r'^gridftp/upload/$', views.gridftp_upload, name='gridftp_upload'), )