Skip to content

Commit fda3c34

Browse files
committed
django tutorial: end of part 3
1 parent e84811a commit fda3c34

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

mysite/mysite/urls.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
# url(r'^$', 'mysite.views.home', name='home'),
77
# url(r'^blog/', include('blog.urls')),
88

9-
url(r'^polls/', include('polls.urls')),
9+
url(r'^polls/', include('polls.urls', namespace="polls")),
1010
url(r'^admin/', include(admin.site.urls)),
1111
]
+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<h1>{{ question.question_text }}</h1>
2+
<ul>
3+
{% for choice in question.choice_set.all %}
4+
<li>{{ choice.choice_text }}</li>
5+
{% endfor %}
6+
</ul>

mysite/polls/templates/polls/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% if latest_question_list %}
22
<ul>
33
{% for question in latest_question_list %}
4-
<li><a href="/polls/{{ question.id }}/">{{ question.question_text }}</a></li>
4+
<li><a href="{% url 'polls:detail' question.id %}">{{ question.question_text }}</a></li>
55
{% endfor %}
66
</ul>
77
{% else %}

mysite/polls/views.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.http import HttpResponse
22
from polls.models import Question
3-
from django.shortcuts import render
3+
from django.shortcuts import render, get_object_or_404
44

55

66
# Create your views here.
@@ -11,7 +11,8 @@ def index(request):
1111

1212

1313
def detail(request, question_id):
14-
return HttpResponse("You're looking at question %s." % question_id)
14+
question = get_object_or_404(Question, pk=question_id)
15+
return render(request, 'polls/detail.html', {'question': question})
1516

1617

1718
def results(request, question_id):

0 commit comments

Comments
 (0)