diff options
| author | Adrien Dorsaz <adrien@adorsaz.ch> | 2013-07-30 17:59:04 +0200 |
|---|---|---|
| committer | Adrien Dorsaz <adrien@adorsaz.ch> | 2013-07-30 17:59:04 +0200 |
| commit | df27f8c352881846d44f40a9c20c88bc0195662d (patch) | |
| tree | 25183cd278aa2928eecad4bb78b6c9a04031623c /papillon | |
| parent | 8dcee66d13738940c6a8b2fb06f13682e3f18402 (diff) | |
| download | Papillon-df27f8c352881846d44f40a9c20c88bc0195662d.tar.bz2 Papillon-df27f8c352881846d44f40a9c20c88bc0195662d.zip | |
Revert "Use patterns to simplify url definition"
This reverts commit 3e2f43a45fb6d4f7e279121198cb792f84c3ae09.
Diffstat (limited to 'papillon')
| -rw-r--r-- | papillon/urls.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/papillon/urls.py b/papillon/urls.py index 24abe23..0f28b45 100644 --- a/papillon/urls.py +++ b/papillon/urls.py @@ -29,24 +29,24 @@ base = '^' + settings.EXTRA_URL if settings.EXTRA_URL and not base.endswith('/'): base += '/' -urlpatterns = patterns('papillon.polls.views', +urlpatterns = patterns('', (base + r'admin/doc/', include('django.contrib.admindocs.urls')), url(base + r'admin/jsi18n/$', 'django.views.i18n.javascript_catalog', name='admin_i18n'), url(base + r'^admin/', include(admin.site.urls)), - url(base + r'$', 'index', name='index'), - url(base + r'create/$', 'create', name='create'), + url(base + r'$', 'papillon.polls.views.index', name='index'), + url(base + r'create/$', 'papillon.polls.views.create', name='create'), url(base + r'edit/(?P<admin_url>\w+)/$', - 'edit', name='edit'), + 'papillon.polls.views.edit', name='edit'), url(base + r'editChoicesAdmin/(?P<admin_url>\w+)/$', - 'editChoicesAdmin', name='edit_choices_admin'), + 'papillon.polls.views.editChoicesAdmin', name='edit_choices_admin'), url(base + r'editChoicesUser/(?P<poll_url>\w+)/$', - 'editChoicesUser', name='edit_choices_user'), + 'papillon.polls.views.editChoicesUser', name='edit_choices_user'), url(base + r'category/(?P<category_id>\w+)/$', - 'category', name='category'), - url(base + r'poll/(?P<poll_url>\w+)/$', 'poll', + 'papillon.polls.views.category', name='category'), + url(base + r'poll/(?P<poll_url>\w+)/$', 'papillon.polls.views.poll', name='poll'), - url(base + r'poll/(?P<poll_url>\w+)/vote/$', 'poll', + url(base + r'poll/(?P<poll_url>\w+)/vote/$', 'papillon.polls.views.poll', name='vote'), url(base + r'feeds/poll/(?P<poll_url>\w+)$', PollLatestEntries(), name='feed'), (base + r'static/(?P<path>.*)$', 'django.views.static.serve', |