Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #23148 -- A few tutorial tweaks #3006

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/intro/reusable-apps.txt
Expand Up @@ -66,6 +66,9 @@ After the previous tutorials, our project should look like this::
polls/
__init__.py
admin.py
migrations/
__init__.py
0001_initial.py
models.py
static/
polls/
Expand Down
5 changes: 4 additions & 1 deletion docs/intro/tutorial01.txt
Expand Up @@ -704,8 +704,11 @@ demonstration:
:filename: polls/models.py

import datetime

from django.db import models
from django.utils import timezone
# ...


class Question(models.Model):
# ...
def was_published_recently(self):
Expand Down
7 changes: 3 additions & 4 deletions docs/intro/tutorial02.txt
Expand Up @@ -275,8 +275,8 @@ with the admin just as we did with ``Question``. That's easy:
:filename: polls/admin.py

from django.contrib import admin
from polls.models import Choice

from polls.models import Choice, Question
# ...
admin.site.register(Choice)

Now "Choices" is an available option in the Django admin. The "Add choice" form
Expand Down Expand Up @@ -319,8 +319,7 @@ registration code to read:
class QuestionAdmin(admin.ModelAdmin):
fieldsets = [
(None, {'fields': ['question_text']}),
('Date information', {'fields': ['pub_date'],
'classes': ['collapse']}),
('Date information', {'fields': ['pub_date'], 'classes': ['collapse']}),
]
inlines = [ChoiceInline]

Expand Down
4 changes: 2 additions & 2 deletions docs/intro/tutorial03.txt
Expand Up @@ -97,7 +97,7 @@ In the ``polls/urls.py`` file include the following code:
from polls import views

urlpatterns = [
url(r'^$', views.index, name='index')
url(r'^$', views.index, name='index'),
]

The next step is to point the root URLconf at the ``polls.urls`` module. In
Expand Down Expand Up @@ -466,7 +466,7 @@ provides a shortcut. Here's the ``detail()`` view, rewritten:
.. snippet::
:filename: polls/views.py

from django.shortcuts import render, get_object_or_404
from django.shortcuts import get_object_or_404, render

from polls.models import Question
# ...
Expand Down
1 change: 1 addition & 0 deletions docs/intro/tutorial04.txt
Expand Up @@ -72,6 +72,7 @@ create a real version. Add the following to ``polls/views.py``:
from django.shortcuts import get_object_or_404, render
from django.http import HttpResponseRedirect, HttpResponse
from django.core.urlresolvers import reverse

from polls.models import Choice, Question
# ...
def vote(request, question_id):
Expand Down