summaryrefslogtreecommitdiff
path: root/allotter/urls.py
diff options
context:
space:
mode:
authorparth2012-03-20 02:35:33 +0530
committerparth2012-03-20 02:35:33 +0530
commit64f6b14cc6c1ee3cec4c2d65e6a130441555b6b4 (patch)
tree76a2b19643f1ae9ddbab423b3ad211be9f5a0fe2 /allotter/urls.py
parentd1ac4284c62ae5ad2c85eed02e831fa9d400a4ef (diff)
parentc78804ce5141565ee0e2a64e7f92aaaa126f30e0 (diff)
downloadaloha-64f6b14cc6c1ee3cec4c2d65e6a130441555b6b4.tar.gz
aloha-64f6b14cc6c1ee3cec4c2d65e6a130441555b6b4.tar.bz2
aloha-64f6b14cc6c1ee3cec4c2d65e6a130441555b6b4.zip
Merge remote-tracking branch 'origin'
Diffstat (limited to 'allotter/urls.py')
-rw-r--r--allotter/urls.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/allotter/urls.py b/allotter/urls.py
index 6238e3c..aa0d62d 100644
--- a/allotter/urls.py
+++ b/allotter/urls.py
@@ -2,8 +2,10 @@ from django.conf.urls.defaults import patterns, url
urlpatterns = patterns('allotter.views',
url(r'^login/$', 'user_login'),
+ url(r'^logout/$', 'user_logout'),
url(r'^apply/$', 'apply'),
- #url(r'^apply/$', 'apply'),
- #url(r'^submit/$', 'submit'),
+ url(r'^(?P<reg_no>\w+)/submit/$', 'submit'), #change into numbers
+ url(r'^(?P<reg_no>\d+)/complete/$', 'complete'), #change into numbers
+ url(r'^$', 'apply'),
#url(r'^quit/$', 'quit'),
)