diff options
| author | Madhusudan.C.S | 2010-07-16 01:33:33 +0530 |
|---|---|---|
| committer | Madhusudan.C.S | 2010-07-16 01:33:33 +0530 |
| commit | d17a97df535fc3722761f2e4fc6b3ceb2a9a03d9 (patch) | |
| tree | f1bb8e2d6c0b0f7d7d5f6578daf85496e2e276f2 /project | |
| parent | 0a26cdc917325b55d4e6a2df85b48d2cc11f6694 (diff) | |
| download | scipycon-d17a97df535fc3722761f2e4fc6b3ceb2a9a03d9.tar.gz scipycon-d17a97df535fc3722761f2e4fc6b3ceb2a9a03d9.tar.bz2 scipycon-d17a97df535fc3722761f2e4fc6b3ceb2a9a03d9.zip | |
Add a scope pattern to the URLs.
Diffstat (limited to 'project')
| -rw-r--r-- | project/scipycon/registration/views.py | 6 | ||||
| -rw-r--r-- | project/urls.py | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/project/scipycon/registration/views.py b/project/scipycon/registration/views.py index 542d6cc..1e73400 100644 --- a/project/scipycon/registration/views.py +++ b/project/scipycon/registration/views.py @@ -1,10 +1,6 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import - import cStringIO as StringIO import csv -# django from django.conf import settings from django.shortcuts import render_to_response from django.template.loader import render_to_string @@ -196,7 +192,7 @@ def edit_registration(request, id, return render_to_response(template_name, RequestContext(request, locals())) -def submit_registration(request, +def submit_registration(request, scope, template_name='registration/submit-registration.html'): '''Allows user to edit registration ''' diff --git a/project/urls.py b/project/urls.py index 10e29b4..50dd5ed 100644 --- a/project/urls.py +++ b/project/urls.py @@ -8,6 +8,11 @@ from django.conf.urls.defaults import * admin.autodiscover() +PROGRAM_PATTERN_CORE = r'[a-z](?:[0-9a-z]|_[0-9a-z])*' +EVENT_PATTERN_CORE =r'(?:[0-9a-z]|_[0-9a-z])*' +SCOPE_ARG_PATTERN = r'(?P<scope>%s/%s)' % ( + PROGRAM_PATTERN_CORE, EVENT_PATTERN_CORE) + # Admin urlpatterns = patterns('', url(r'^$', direct_to_template, {"template": "home.html"}, name='home'), @@ -27,11 +32,14 @@ urlpatterns += patterns('project.scipycon.talk.views', # Registration urlpatterns += patterns('project.scipycon.registration.views', - url(r'^registrations/$', 'registrations', name='scipycon_registrations'), - url(r'^submit-registration/$', 'submit_registration', name='scipycon_submit_registration'), - url(r'^edit-registration/(?P<id>\d+)/$', 'edit_registration', - name='scipycon_edit_registration'), - url(r'^download_csv/', 'download_csv', name="download_csv"), + url(r'^%s/registrations/$' % (SCOPE_ARG_PATTERN), 'registrations', + name='scipycon_registrations'), + url(r'^%s/submit-registration/$' % (SCOPE_ARG_PATTERN), + 'submit_registration', name='scipycon_submit_registration'), + url(r'^%s/edit-registration/(?P<id>\d+)/$' % (SCOPE_ARG_PATTERN), + 'edit_registration', name='scipycon_edit_registration'), + url(r'^%s/download_csv/' % (SCOPE_ARG_PATTERN), + 'download_csv', name="download_csv"), ) |