Ticket #6550: tutorial4_6550.diff

tutorial03.txt

@@ -25 +25 @@
 
 In our poll application, we'll have the following four views:
 
-    * Poll "archive" page -- displays the latest few polls.
+    * Poll "archive" page -- displays the list of polls.
     * Poll "detail" page -- displays a poll question, with no results but
       with a form to vote.
     * Poll "results" page -- displays results for a particular poll.
@@ -183 +183 @@
 
 Because it's convenient, let's use Django's own database API, which we covered
 in Tutorial 1. Here's one stab at the ``index()`` view, which displays the
-latest 5 poll questions in the system, separated by commas, according to
+list of poll questions in the system, separated by commas, according to
 publication date::
 
     from mysite.polls.models import Poll
     from django.http import HttpResponse
 
     def index(request):
-        latest_poll_list = Poll.objects.all().order_by('-pub_date')[:5]
-        output = ', '.join([p.question for p in latest_poll_list])
+        poll_list = Poll.objects.all().order_by('-pub_date')
+        output = ', '.join([p.question for p in poll_list])
         return HttpResponse(output)
 
 There's a problem here, though: The page's design is hard-coded in the view. If
@@ -203 +203 @@
     from django.http import HttpResponse
 
     def index(request):
-        latest_poll_list = Poll.objects.all().order_by('-pub_date')[:5]
+        poll_list = Poll.objects.all().order_by('-pub_date')
         t = loader.get_template('polls/index.html')
         c = Context({
-            'latest_poll_list': latest_poll_list,
+            'poll_list': poll_list,
         })
         return HttpResponse(t.render(c))
 
@@ -234 +234 @@
 
 Put the following code in that template::
 
-    {% if latest_poll_list %}
+    {% if poll_list %}
         <ul>
-        {% for poll in latest_poll_list %}
+        {% for poll in poll_list %}
             <li>{{ poll.question }}</li>
         {% endfor %}
         </ul>
@@ -258 +258 @@
     from mysite.polls.models import Poll
 
     def index(request):
-        latest_poll_list = Poll.objects.all().order_by('-pub_date')[:5]
-        return render_to_response('polls/index.html', {'latest_poll_list': latest_poll_list})
+        poll_list = Poll.objects.all().order_by('-pub_date')
+        return render_to_response('polls/index.html', {'poll_list': poll_list})
 
 Note that once we've done this in all these views, we no longer need to import ``loader``, ``Context`` and ``HttpResponse``.