diff options
| author | Carl Meyer <carl@oddbird.net> | 2011-11-06 16:58:04 +0000 |
|---|---|---|
| committer | Carl Meyer <carl@oddbird.net> | 2011-11-06 16:58:04 +0000 |
| commit | 7f658a5429f1b8eb72157535ecdc05a136dc2be4 (patch) | |
| tree | 5b8b7dc836966de32f522a3325e9e36946155a57 /docs/intro/tutorial04.txt | |
| parent | 5f64af9ecb91b3a261b9094a8e6f8894c32abe61 (diff) | |
Refs #17171 -- Updated tutorial sections 3 and 4 to follow the startproject template and consistently use url() function in URLconf. Thanks haimunt for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/intro/tutorial04.txt')
| -rw-r--r-- | docs/intro/tutorial04.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt index 602c315a7e..85d54c34f6 100644 --- a/docs/intro/tutorial04.txt +++ b/docs/intro/tutorial04.txt @@ -221,10 +221,10 @@ tutorial so far:: from django.conf.urls import patterns, include, url urlpatterns = patterns('polls.views', - (r'^$', 'index'), - (r'^(?P<poll_id>\d+)/$', 'detail'), - (r'^(?P<poll_id>\d+)/results/$', 'results'), - (r'^(?P<poll_id>\d+)/vote/$', 'vote'), + url(r'^$', 'index'), + url(r'^(?P<poll_id>\d+)/$', 'detail'), + url(r'^(?P<poll_id>\d+)/results/$', 'results'), + url(r'^(?P<poll_id>\d+)/vote/$', 'vote'), ) Change it like so:: @@ -234,12 +234,12 @@ Change it like so:: from polls.models import Poll urlpatterns = patterns('', - (r'^$', + url(r'^$', ListView.as_view( queryset=Poll.objects.order_by('-pub_date')[:5], context_object_name='latest_poll_list', template_name='polls/index.html')), - (r'^(?P<pk>\d+)/$', + url(r'^(?P<pk>\d+)/$', DetailView.as_view( model=Poll, template_name='polls/detail.html')), @@ -248,7 +248,7 @@ Change it like so:: model=Poll, template_name='polls/results.html'), name='poll_results'), - (r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), + url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), ) We're using two generic views here: |