summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/index.txt168
-rw-r--r--docs/internals/documentation.txt5
-rw-r--r--docs/intro/tutorial03.txt25
-rw-r--r--docs/intro/tutorial04.txt20
-rw-r--r--docs/ref/files/storage.txt4
-rw-r--r--docs/ref/generic-views.txt72
-rw-r--r--docs/ref/index.txt1
-rw-r--r--docs/ref/models/fields.txt30
-rw-r--r--docs/ref/models/querysets.txt2
-rw-r--r--docs/topics/db/sql.txt46
-rw-r--r--docs/topics/forms/modelforms.txt23
-rw-r--r--docs/topics/generic-views.txt503
-rw-r--r--docs/topics/index.txt2
13 files changed, 709 insertions, 192 deletions
diff --git a/docs/index.txt b/docs/index.txt
index 6f6151b6d6..89ee463dfa 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -1,3 +1,4 @@
+
.. _index:
====================
@@ -33,120 +34,123 @@ Having trouble? We'd like to help!
First steps
===========
- * **From scratch:**
+ * **From scratch:**
:ref:`Overview <intro-overview>` |
:ref:`Installation <intro-install>`
-
- * **Tutorial:**
- :ref:`Part 1 <intro-tutorial01>` |
- :ref:`Part 2 <intro-tutorial02>` |
- :ref:`Part 3 <intro-tutorial03>` |
+
+ * **Tutorial:**
+ :ref:`Part 1 <intro-tutorial01>` |
+ :ref:`Part 2 <intro-tutorial02>` |
+ :ref:`Part 3 <intro-tutorial03>` |
:ref:`Part 4 <intro-tutorial04>`
The model layer
===============
- * **Models:**
- :ref:`Model syntax <topics-db-models>` |
- :ref:`Field types <ref-models-fields>` |
+ * **Models:**
+ :ref:`Model syntax <topics-db-models>` |
+ :ref:`Field types <ref-models-fields>` |
:ref:`Meta options <ref-models-options>`
-
- * **QuerySets:**
- :ref:`Executing queries <topics-db-queries>` |
+
+ * **QuerySets:**
+ :ref:`Executing queries <topics-db-queries>` |
:ref:`QuerySet method reference <ref-models-querysets>`
-
- * **Model instances:**
- :ref:`Instance methods <ref-models-instances>` |
+
+ * **Model instances:**
+ :ref:`Instance methods <ref-models-instances>` |
:ref:`Accessing related objects <ref-models-relations>`
-
- * **Advanced:**
- :ref:`Managers <topics-db-managers>` |
- :ref:`Raw SQL <topics-db-sql>` |
- :ref:`Transactions <topics-db-transactions>` |
- :ref:`Aggregation <topics-db-aggregation>` |
+
+ * **Advanced:**
+ :ref:`Managers <topics-db-managers>` |
+ :ref:`Raw SQL <topics-db-sql>` |
+ :ref:`Transactions <topics-db-transactions>` |
+ :ref:`Aggregation <topics-db-aggregation>` |
:ref:`Custom fields <howto-custom-model-fields>`
-
- * **Other:**
- :ref:`Supported databases <ref-databases>` |
- :ref:`Legacy databases <howto-legacy-databases>` |
+
+ * **Other:**
+ :ref:`Supported databases <ref-databases>` |
+ :ref:`Legacy databases <howto-legacy-databases>` |
:ref:`Providing initial data <howto-initial-data>`
The template layer
==================
- * **For designers:**
- :ref:`Syntax overview <topics-templates>` |
+ * **For designers:**
+ :ref:`Syntax overview <topics-templates>` |
:ref:`Built-in tags and filters <ref-templates-builtins>`
-
- * **For programmers:**
- :ref:`Template API <ref-templates-api>` |
+
+ * **For programmers:**
+ :ref:`Template API <ref-templates-api>` |
:ref:`Custom tags and filters <howto-custom-template-tags>`
The view layer
==============
- * **The basics:**
- :ref:`URLconfs <topics-http-urls>` |
- :ref:`View functions <topics-http-views>` |
+ * **The basics:**
+ :ref:`URLconfs <topics-http-urls>` |
+ :ref:`View functions <topics-http-views>` |
:ref:`Shortcuts <topics-http-shortcuts>`
-
+
* **Reference:** :ref:`Request/response objects <ref-request-response>`
-
- * **File uploads:**
- :ref:`Overview <topics-http-file-uploads>` |
- :ref:`File objects <ref-files-file>` |
- :ref:`Storage API <ref-files-storage>` |
- :ref:`Managing files <topics-files>` |
+
+ * **File uploads:**
+ :ref:`Overview <topics-http-file-uploads>` |
+ :ref:`File objects <ref-files-file>` |
+ :ref:`Storage API <ref-files-storage>` |
+ :ref:`Managing files <topics-files>` |
:ref:`Custom storage <howto-custom-file-storage>`
-
- * **Advanced:**
- :ref:`Generic views <ref-generic-views>` |
- :ref:`Generating CSV <howto-outputting-csv>` |
+
+ * **Generic views:**
+ :ref:`Overview<topics-generic-views>` |
+ :ref:`Built-in generic views<ref-generic-views>`
+
+ * **Advanced:**
+ :ref:`Generating CSV <howto-outputting-csv>` |
:ref:`Generating PDF <howto-outputting-pdf>`
-
- * **Middleware:**
- :ref:`Overview <topics-http-middleware>` |
+
+ * **Middleware:**
+ :ref:`Overview <topics-http-middleware>` |
:ref:`Built-in middleware classes <ref-middleware>`
Forms
=====
- * **The basics:**
- :ref:`Overview <topics-forms-index>` |
- :ref:`Form API <ref-forms-api>` |
- :ref:`Built-in fields <ref-forms-fields>` |
+ * **The basics:**
+ :ref:`Overview <topics-forms-index>` |
+ :ref:`Form API <ref-forms-api>` |
+ :ref:`Built-in fields <ref-forms-fields>` |
:ref:`Built-in widgets <ref-forms-widgets>`
-
- * **Advanced:**
- :ref:`Forms for models <topics-forms-modelforms>` |
- :ref:`Integrating media <topics-forms-media>` |
- :ref:`Formsets <topics-forms-formsets>` |
+
+ * **Advanced:**
+ :ref:`Forms for models <topics-forms-modelforms>` |
+ :ref:`Integrating media <topics-forms-media>` |
+ :ref:`Formsets <topics-forms-formsets>` |
:ref:`Customizing validation <ref-forms-validation>`
-
- * **Extras:**
- :ref:`Form preview <ref-contrib-formtools-form-preview>` |
+
+ * **Extras:**
+ :ref:`Form preview <ref-contrib-formtools-form-preview>` |
:ref:`Form wizard <ref-contrib-formtools-form-wizard>`
The development process
=======================
- * **Settings:**
- :ref:`Overview <topics-settings>` |
+ * **Settings:**
+ :ref:`Overview <topics-settings>` |
:ref:`Full list of settings <ref-settings>`
- * **django-admin.py and manage.py:**
- :ref:`Overview <ref-django-admin>` |
+ * **django-admin.py and manage.py:**
+ :ref:`Overview <ref-django-admin>` |
:ref:`Adding custom commands <howto-custom-management-commands>`
-
+
* **Testing:** :ref:`Overview <topics-testing>`
-
- * **Deployment:**
- :ref:`Overview <howto-deployment-index>` |
+
+ * **Deployment:**
+ :ref:`Overview <howto-deployment-index>` |
:ref:`Apache/mod_wsgi <howto-deployment-modwsgi>` |
:ref:`Apache/mod_python <howto-deployment-modpython>` |
- :ref:`FastCGI/SCGI/AJP <howto-deployment-fastcgi>` |
- :ref:`Apache authentication <howto-apache-auth>` |
- :ref:`Serving static files <howto-static-files>` |
+ :ref:`FastCGI/SCGI/AJP <howto-deployment-fastcgi>` |
+ :ref:`Apache authentication <howto-apache-auth>` |
+ :ref:`Serving static files <howto-static-files>` |
:ref:`Tracking code errors by e-mail <howto-error-reporting>`
Other batteries included
@@ -180,22 +184,22 @@ Other batteries included
The Django open-source project
==============================
- * **Community:**
- :ref:`How to get involved <internals-contributing>` |
- :ref:`The release process <internals-release-process>` |
+ * **Community:**
+ :ref:`How to get involved <internals-contributing>` |
+ :ref:`The release process <internals-release-process>` |
:ref:`Team of committers <internals-committers>`
-
- * **Design philosophies:**
+
+ * **Design philosophies:**
:ref:`Overview <misc-design-philosophies>`
-
- * **Documentation:**
+
+ * **Documentation:**
:ref:`About this documentation <internals-documentation>`
-
- * **Third-party distributions:**
+
+ * **Third-party distributions:**
:ref:`Overview <misc-distributions>`
-
- * **Django over time:**
- :ref:`API stability <misc-api-stability>` |
+
+ * **Django over time:**
+ :ref:`API stability <misc-api-stability>` |
:ref:`Archive of release notes <releases-index>` | `Backwards-incompatible changes`_
.. _Backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
diff --git a/docs/internals/documentation.txt b/docs/internals/documentation.txt
index b89b296540..f33af32597 100644
--- a/docs/internals/documentation.txt
+++ b/docs/internals/documentation.txt
@@ -130,11 +130,6 @@ TODO
The work is mostly done, but here's what's left, in rough order of priority.
- * Fix up generic view docs: adapt Chapter 9 of the Django Book (consider
- this TODO item my permission and license) into
- ``topics/generic-views.txt``; remove the intro material from
- ``ref/generic-views.txt`` and just leave the function reference.
-
* Change the "Added/changed in development version" callouts to proper
Sphinx ``.. versionadded::`` or ``.. versionchanged::`` directives.
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index 53c2bcfcfc..867b7d1224 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -16,28 +16,28 @@ a specific function and has a specific template. For example, in a weblog
application, you might have the following views:
* Blog homepage -- displays the latest few entries.
-
+
* Entry "detail" page -- permalink page for a single entry.
-
+
* Year-based archive page -- displays all months with entries in the
given year.
-
+
* Month-based archive page -- displays all days with entries in the
given month.
-
+
* Day-based archive page -- displays all entries in the given day.
-
+
* Comment action -- handles posting comments to a given entry.
In our poll application, we'll have the following four views:
* Poll "archive" page -- displays the latest few 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.
-
+
* Vote action -- handles voting for a particular choice in a particular
poll.
@@ -82,6 +82,9 @@ Time for an example. Edit ``mysite/urls.py`` so it looks like this::
from django.conf.urls.defaults import *
+ from django.contrib import admin
+ admin.autodiscover()
+
urlpatterns = patterns('',
(r'^polls/$', 'mysite.polls.views.index'),
(r'^polls/(?P<poll_id>\d+)/$', 'mysite.polls.views.detail'),
@@ -307,7 +310,7 @@ We'll discuss what you could put in that ``polls/detail.html`` template a bit
later, but if you'd like to quickly get the above example working, just::
{{ poll }}
-
+
will get you started for now.
A shortcut: get_object_or_404()
@@ -371,12 +374,12 @@ Three more things to note about 404 views:
* The 404 view is also called if Django doesn't find a match after checking
every regular expression in the URLconf.
-
+
* If you don't define your own 404 view -- and simply use the default, which
is recommended -- you still have one obligation: To create a ``404.html``
template in the root of your template directory. The default 404 view will
use that template for all 404 errors.
-
+
* If :setting:`DEBUG` is set to ``False`` (in your settings module) and if
you didn't create a ``404.html`` file, an ``Http500`` is raised instead.
So remember to create a ``404.html``.
diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt
index 07aa477d67..28ace85ca8 100644
--- a/docs/intro/tutorial04.txt
+++ b/docs/intro/tutorial04.txt
@@ -20,7 +20,7 @@ tutorial, so that the template contains an HTML ``<form>`` element:
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
- <form action="vote/" method="post">
+ <form action="/polls/{{ poll.id }}/vote/" method="post">
{% for choice in poll.choice_set.all %}
<input type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}" />
<label for="choice{{ forloop.counter }}">{{ choice.choice }}</label><br />
@@ -36,12 +36,12 @@ A quick rundown:
selects one of the radio buttons and submits the form, it'll send the
POST data ``choice=3``. This is HTML Forms 101.
- * We set the form's ``action`` to ``vote/``, and we set ``method="post"``.
- Using ``method="post"`` (as opposed to ``method="get"``) is very
- important, because the act of submitting this form will alter data
- server-side. Whenever you create a form that alters data server-side, use
- ``method="post"``. This tip isn't specific to Django; it's just good Web
- development practice.
+ * We set the form's ``action`` to ``/polls/{{ poll.id }}/vote/``, and we
+ set ``method="post"``. Using ``method="post"`` (as opposed to
+ ``method="get"``) is very important, because the act of submitting this
+ form will alter data server-side. Whenever you create a form that alters
+ data server-side, use ``method="post"``. This tip isn't specific to
+ Django; it's just good Web development practice.
* ``forloop.counter`` indicates how many times the :ttag:`for` tag has gone
through its loop
@@ -173,11 +173,11 @@ bunch of our own code. We'll just have to take a few steps to make the
conversion. We will:
1. Convert the URLconf.
-
+
2. Rename a few templates.
-
+
3. Delete some the old, now unneeded views.
-
+
4. Fix up URL handling for the new views.
Read on for details.
diff --git a/docs/ref/files/storage.txt b/docs/ref/files/storage.txt
index 0ca577059e..c8aafa8626 100644
--- a/docs/ref/files/storage.txt
+++ b/docs/ref/files/storage.txt
@@ -43,8 +43,8 @@ modify the filename as necessary to get a unique name. The actual name of the
stored file will be returned.
The ``content`` argument must be an instance of
-:class:`django.db.files.File` or of a subclass of
-:class:`~django.db.files.File`.
+:class:`django.core.files.File` or of a subclass of
+:class:`~django.core.files.File`.
``Storage.delete(name)``
~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/ref/generic-views.txt b/docs/ref/generic-views.txt
index 427ef91090..4752a705a0 100644
--- a/docs/ref/generic-views.txt
+++ b/docs/ref/generic-views.txt
@@ -9,67 +9,18 @@ again and again. In Django, the most common of these patterns have been
abstracted into "generic views" that let you quickly provide common views of
an object without actually needing to write any Python code.
-Django's generic views contain the following:
+A general introduction to generic views can be found in the :ref:`topic guide
+<topics-generic-views>`.
- * A set of views for doing list/detail interfaces.
-
- * A set of views for year/month/day archive pages and associated
- detail and "latest" pages (for example, the Django weblog's year_,
- month_, day_, detail_, and latest_ pages).
-
- * A set of views for creating, editing, and deleting objects.
-
-.. _year: http://www.djangoproject.com/weblog/2005/
-.. _month: http://www.djangoproject.com/weblog/2005/jul/
-.. _day: http://www.djangoproject.com/weblog/2005/jul/20/
-.. _detail: http://www.djangoproject.com/weblog/2005/jul/20/autoreload/
-.. _latest: http://www.djangoproject.com/weblog/
-
-All of these views are used by creating configuration dictionaries in
-your URLconf files and passing those dictionaries as the third member of the
-URLconf tuple for a given pattern. For example, here's the URLconf for the
-simple weblog app that drives the blog on djangoproject.com::
-
- from django.conf.urls.defaults import *
- from django_website.apps.blog.models import Entry
-
- info_dict = {
- 'queryset': Entry.objects.all(),
- 'date_field': 'pub_date',
- }
-
- urlpatterns = patterns('django.views.generic.date_based',
- (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[-\w]+)/$', 'object_detail', info_dict),
- (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/$', 'archive_day', info_dict),
- (r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'archive_month', info_dict),
- (r'^(?P<year>\d{4})/$', 'archive_year', info_dict),
- (r'^$', 'archive_index', info_dict),
- )
-
-As you can see, this URLconf defines a few options in ``info_dict``.
-``'queryset'`` gives the generic view a ``QuerySet`` of objects to use (in this
-case, all of the ``Entry`` objects) and tells the generic view which model is
-being used.
-
-Documentation of each generic view follows, along with a list of all keyword
-arguments that a generic view expects. Remember that as in the example above,
-arguments may either come from the URL pattern (as ``month``, ``day``,
-``year``, etc. do above) or from the additional-information dictionary (as for
-``queryset``, ``date_field``, etc.).
+This reference contains details of Django's built-in generic views, along with
+a list of all keyword arguments that a generic view expects. Remember that
+arguments may either come from the URL pattern or from the ``extra_context``
+additional-information dictionary.
Most generic views require the ``queryset`` key, which is a ``QuerySet``
instance; see :ref:`topics-db-queries` for more information about ``QuerySet``
objects.
-Most views also take an optional ``extra_context`` dictionary that you can use
-to pass any auxiliary information you wish to the view. The values in the
-``extra_context`` dictionary can be either functions (or other callables) or
-other objects. Functions are evaluated just before they are passed to the
-template. However, note that QuerySets retrieve and cache their data when they
-are first evaluated, so if you want to pass in a QuerySet via
-``extra_context`` that is always fresh you need to wrap it in a function or
-lambda that returns the QuerySet.
-
"Simple" generic views
======================
@@ -801,12 +752,12 @@ specify the page number in the URL in one of two ways:
/objects/?page=3
- * To loop over all the available page numbers, use the ``page_range``
- variable. You can iterate over the list provided by ``page_range``
+ * To loop over all the available page numbers, use the ``page_range``
+ variable. You can iterate over the list provided by ``page_range``
to create a link to every page of results.
These values and lists are 1-based, not 0-based, so the first page would be
-represented as page ``1``.
+represented as page ``1``.
For more on pagination, read the :ref:`pagination documentation
<topics-pagination>`.
@@ -818,7 +769,7 @@ As a special case, you are also permitted to use ``last`` as a value for
/objects/?page=last
-This allows you to access the final page of results without first having to
+This allows you to access the final page of results without first having to
determine how many pages there are.
Note that ``page`` *must* be either a valid page number or the value ``last``;
@@ -909,7 +860,7 @@ library <topics-forms-index>` to build and display the form.
**Description:**
A page that displays a form for creating an object, redisplaying the form with
-validation errors (if there are any) and saving the object.
+validation errors (if there are any) and saving the object.
**Required arguments:**
@@ -1137,3 +1088,4 @@ In addition to ``extra_context``, the template's context will be:
variable's name depends on the ``template_object_name`` parameter, which
is ``'object'`` by default. If ``template_object_name`` is ``'foo'``,
this variable's name will be ``foo``.
+
diff --git a/docs/ref/index.txt b/docs/ref/index.txt
index 3ffa1fcce1..6cc796d8e4 100644
--- a/docs/ref/index.txt
+++ b/docs/ref/index.txt
@@ -20,3 +20,4 @@ API Reference
signals
templates/index
unicode
+
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 2ec74e4306..177df12862 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -800,21 +800,22 @@ you can use the name of the model, rather than the model object itself::
class Manufacturer(models.Model):
# ...
-Note, however, that this only refers to models in the same ``models.py`` file --
-you cannot use a string to reference a model defined in another application or
-imported from elsewhere.
-
-.. versionchanged:: 1.0
- Refering models in other applications must include the application label.
+.. versionadded:: 1.0
-To refer to models defined in another
-application, you must instead explicitly specify the application label. For
-example, if the ``Manufacturer`` model above is defined in another application
-called ``production``, you'd need to use::
+To refer to models defined in another application, you can explicitly specify
+a model with the full application label. For example, if the ``Manufacturer``
+model above is defined in another application called ``production``, you'd
+need to use::
class Car(models.Model):
manufacturer = models.ForeignKey('production.Manufacturer')
+This sort of reference can be useful when resolving circular import
+dependencies between two applications.
+
+Database Representation
+~~~~~~~~~~~~~~~~~~~~~~~
+
Behind the scenes, Django appends ``"_id"`` to the field name to create its
database column name. In the above example, the database table for the ``Car``
model will have a ``manufacturer_id`` column. (You can change this explicitly by
@@ -824,6 +825,9 @@ deal with the field names of your model object.
.. _foreign-key-arguments:
+Arguments
+~~~~~~~~~
+
:class:`ForeignKey` accepts an extra set of arguments -- all optional -- that
define the details of how the relation works.
@@ -871,6 +875,9 @@ the model is related. This works exactly the same as it does for
:class:`ForeignKey`, including all the options regarding :ref:`recursive
<recursive-relationships>` and :ref:`lazy <lazy-relationships>` relationships.
+Database Representation
+~~~~~~~~~~~~~~~~~~~~~~~
+
Behind the scenes, Django creates an intermediary join table to represent the
many-to-many relationship. By default, this table name is generated using the
names of the two tables being joined. Since some databases don't support table
@@ -882,6 +889,9 @@ You can manually provide the name of the join table using the
.. _manytomany-arguments:
+Arguments
+~~~~~~~~~
+
:class:`ManyToManyField` accepts an extra set of arguments -- all optional --
that control how the relationship functions.
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 6c08fe079e..eb8fbfd833 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -616,6 +616,8 @@ call, since they are conflicting options.
Both the ``depth`` argument and the ability to specify field names in the call
to ``select_related()`` are new in Django version 1.0.
+.. _extra:
+
``extra(select=None, where=None, params=None, tables=None, order_by=None, select_params=None)``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt
index 4352908909..9c534709ca 100644
--- a/docs/topics/db/sql.txt
+++ b/docs/topics/db/sql.txt
@@ -29,6 +29,45 @@ is required. For example::
return row
+.. _transactions-and-raw-sql:
+
+Transactions and raw SQL
+------------------------
+If you are using transaction decorators (such as ``commit_on_success``) to
+wrap your views and provide transaction control, you don't have to make a
+manual call to ``transaction.commit_unless_managed()`` -- you can manually
+commit if you want to, but you aren't required to, since the decorator will
+commit for you. However, if you don't manually commit your changes, you will
+need to manually mark the transaction as dirty, using
+``transaction.set_dirty()``::
+
+ @commit_on_success
+ def my_custom_sql_view(request, value):
+ from django.db import connection, transaction
+ cursor = connection.cursor()
+
+ # Data modifying operation
+ cursor.execute("UPDATE bar SET foo = 1 WHERE baz = %s", [value])
+
+ # Since we modified data, mark the transaction as dirty
+ transaction.set_dirty()
+
+ # Data retrieval operation. This doesn't dirty the transaction,
+ # so no call to set_dirty() is required.
+ cursor.execute("SELECT foo FROM bar WHERE baz = %s", [value])
+ row = cursor.fetchone()
+
+ return render_to_response('template.html', {'row': row})
+
+The call to ``set_dirty()`` is made automatically when you use the Django ORM
+to make data modifying database calls. However, when you use raw SQL, Django
+has no way of knowing if your SQL modifies data or not. The manual call to
+``set_dirty()`` ensures that Django knows that there are modifications that
+must be committed.
+
+Connections and cursors
+-----------------------
+
``connection`` and ``cursor`` mostly implement the standard `Python DB-API`_
(except when it comes to :ref:`transaction handling <topics-db-transactions>`).
If you're not familiar with the Python DB-API, note that the SQL statement in
@@ -39,9 +78,12 @@ necessary. (Also note that Django expects the ``"%s"`` placeholder, *not* the
``"?"`` placeholder, which is used by the SQLite Python bindings. This is for
the sake of consistency and sanity.)
+An easier option?
+-----------------
+
A final note: If all you want to do is a custom ``WHERE`` clause, you can just
-use the ``where``, ``tables`` and ``params`` arguments to the standard lookup
-API.
+use the ``where``, ``tables`` and ``params`` arguments to the
+:ref:`extra clause <extra>` in the standard queryset API.
.. _Python DB-API: http://www.python.org/peps/pep-0249.html
diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt
index 370ac887b7..690ca7f391 100644
--- a/docs/topics/forms/modelforms.txt
+++ b/docs/topics/forms/modelforms.txt
@@ -323,16 +323,19 @@ Since the Author model has only 3 fields, 'name', 'title', and
to be empty, and does not provide a default value for the missing fields,
any attempt to ``save()`` a ``ModelForm`` with missing fields will fail.
To avoid this failure, you must instantiate your model with initial values
- for the missing, but required fields, or use ``save(commit=False)`` and
- manually set any extra required fields::
+ for the missing, but required fields::
- instance = Instance(required_field='value')
- form = InstanceForm(request.POST, instance=instance)
- new_instance = form.save()
+ author = Author(title='Mr')
+ form = PartialAuthorForm(request.POST, instance=author)
+ form.save()
- instance = form.save(commit=False)
- instance.required_field = 'new value'
- new_instance = instance.save()
+ Alternatively, you can use ``save(commit=False)`` and manually set
+ any extra required fields::
+
+ form = PartialAuthorForm(request.POST)
+ author = form.save(commit=False)
+ author.title = 'Mr'
+ author.save()
See the `section on saving forms`_ for more details on using
``save(commit=False)``.
@@ -563,8 +566,8 @@ number of objects needed::
>>> formset.initial
[{'id': 1, 'name': u'Charles Baudelaire'}, {'id': 3, 'name': u'Paul Verlaine'}]
-If the value of ``max_num`` is higher than the number of objects returned, up to
-``extra`` additional blank forms will be added to the formset, so long as the
+If the value of ``max_num`` is higher than the number of objects returned, up to
+``extra`` additional blank forms will be added to the formset, so long as the
total number of forms does not exceed ``max_num``::
>>> AuthorFormSet = modelformset_factory(Author, max_num=4, extra=2)
diff --git a/docs/topics/generic-views.txt b/docs/topics/generic-views.txt
new file mode 100644
index 0000000000..c7d751a86b
--- /dev/null
+++ b/docs/topics/generic-views.txt
@@ -0,0 +1,503 @@
+.. _topics-generic-views:
+
+=============
+Generic views
+=============
+
+Writing Web applications can be monotonous, because we repeat certain patterns
+again and again. Django tries to take away some of that monotony at the model
+and template layers, but Web developers also experience this boredom at the view
+level.
+
+Django's *generic views* were developed to ease that pain. They take certain
+common idioms and patterns found in view development and abstract them so that
+you can quickly write common views of data without having to write too much
+code.
+
+We can recognize certain common tasks, like displaying a list of objects, and
+write code that displays a list of *any* object. Then the model in question can
+be passed as an extra argument to the URLconf.
+
+Django ships with generic views to do the following:
+
+ * Perform common "simple" tasks: redirect to a different page and
+ render a given template.
+
+ * Display list and detail pages for a single object. If we were creating an
+ application to manage conferences then a ``talk_list`` view and a
+ ``registered_user_list`` view would be examples of list views. A single
+ talk page is an example of what we call a "detail" view.
+
+ * Present date-based objects in year/month/day archive pages,
+ associated detail, and "latest" pages. The Django Weblog's
+ (http://www.djangoproject.com/weblog/) year, month, and
+ day archives are built with these, as would be a typical
+ newspaper's archives.
+
+ * Allow users to create, update, and delete objects -- with or
+ without authorization.
+
+Taken together, these views provide easy interfaces to perform the most common
+tasks developers encounter.
+
+Using generic views
+===================
+
+All of these views are used by creating configuration dictionaries in
+your URLconf files and passing those dictionaries as the third member of the
+URLconf tuple for a given pattern.
+
+For example, here's a simple URLconf you could use to present a static "about"
+page::
+
+ from django.conf.urls.defaults import *
+ from django.views.generic.simple import direct_to_template
+
+ urlpatterns = patterns('',
+ ('^about/$', direct_to_template, {
+ 'template': 'about.html'
+ })
+ )
+
+Though this might seem a bit "magical" at first glance -- look, a view with no
+code! --, actually the ``direct_to_template`` view simply grabs information from
+the extra-parameters dictionary and uses that information when rendering the
+view.
+
+Because this generic view -- and all the others -- is a regular view functions
+like any other, we can reuse it inside our own views. As an example, let's
+extend our "about" example to map URLs of the form ``/about/<whatever>/`` to
+statically rendered ``about/<whatever>.html``. We'll do this by first modifying
+the URLconf to point to a view function:
+
+.. parsed-literal::
+
+ from django.conf.urls.defaults import *
+ from django.views.generic.simple import direct_to_template
+ **from mysite.books.views import about_pages**
+
+ urlpatterns = patterns('',
+ ('^about/$', direct_to_template, {
+ 'template': 'about.html'
+ }),
+ **('^about/(\w+)/$', about_pages),**
+ )
+
+Next, we'll write the ``about_pages`` view::
+
+ from django.http import Http404
+ from django.template import TemplateDoesNotExist
+ from django.views.generic.simple import direct_to_template
+
+ def about_pages(request, page):
+ try:
+ return direct_to_template(request, template="about/%s.html" % page)
+ except TemplateDoesNotExist:
+ raise Http404()
+
+Here we're treating ``direct_to_template`` like any other function. Since it
+returns an ``HttpResponse``, we can simply return it as-is. The only slightly
+tricky business here is dealing with missing templates. We don't want a
+nonexistent template to cause a server error, so we catch
+``TemplateDoesNotExist`` exceptions and return 404 errors instead.
+
+.. admonition:: Is there a security vulnerability here?
+
+ Sharp-eyed readers may have noticed a possible security hole: we're
+ constructing the template name using interpolated content from the browser
+ (``template="about/%s.html" % page``). At first glance, this looks like a
+ classic *directory traversal* vulnerability. But is it really?
+
+ Not exactly. Yes, a maliciously crafted value of ``page`` could cause
+ directory traversal, but although ``page`` *is* taken from the request URL,
+ not every value will be accepted. The key is in the URLconf: we're using
+ the regular expression ``\w+`` to match the ``page`` part of the URL, and
+ ``\w`` only accepts letters and numbers. Thus, any malicious characters
+ (dots and slashes, here) will be rejected by the URL resolver before they
+ reach the view itself.
+
+Generic views of objects
+========================
+
+The ``direct_to_template`` certainly is useful, but Django's generic views
+really shine when it comes to presenting views on your database content. Because
+it's such a common task, Django comes with a handful of built-in generic views
+that make generating list and detail views of objects incredibly easy.
+
+Let's take a look at one of these generic views: the "object list" view. We'll
+be using these models::
+
+ # models.py
+ from django.db import models
+
+ class Publisher(models.Model):
+ name = models.CharField(max_length=30)
+ address = models.CharField(max_length=50)
+ city = models.CharField(max_length=60)
+ state_province = models.CharField(max_length=30)
+ country = models.CharField(max_length=50)
+ website = models.URLField()
+
+ def __unicode__(self):
+ return self.name
+
+ class Meta:
+ ordering = ["-name"]
+
+ class Book(models.Model):
+ title = models.CharField(max_length=100)
+ authors = models.ManyToManyField('Author')
+ publisher = models.ForeignKey(Publisher)
+ publication_date = models.DateField()
+
+To build a list page of all books, we'd use a URLconf along these lines::
+
+ from django.conf.urls.defaults import *
+ from django.views.generic import list_detail
+ from mysite.books.models import Publisher
+
+ publisher_info = {
+ "queryset" : Publisher.objects.all(),
+ }
+
+ urlpatterns = patterns('',
+ (r'^publishers/$', list_detail.object_list, publisher_info)
+ )
+
+That's all the Python code we need to write. We still need to write a template,
+however. We could explicitly tell the ``object_list`` view which template to use
+by including a ``template_name`` key in the extra arguments dictionary, but in
+the absence of an explicit template Django will infer one from the object's
+name. In this case, the inferred template will be
+``"books/publisher_list.html"`` -- the "books" part comes from the name of the
+app that defines the model, while the "publisher" bit is just the lowercased
+version of the model's name.
+
+.. highlightlang:: html+django
+
+This template will be rendered against a context containing a variable called
+``object_list`` that contains all the book objects. A very simple template
+might look like the following::
+
+ {% extends "base.html" %}
+
+ {% block content %}
+ <h2>Publishers</h2>
+ <ul>
+ {% for publisher in object_list %}
+ <li>{{ publisher.name }}</li>
+ {% endfor %}
+ </ul>
+ {% endblock %}
+
+That's really all there is to it. All the cool features of generic views come
+from changing the "info" dictionary passed to the generic view. The
+:ref:`generic views reference<ref-generic-views>` documents all the generic
+views and all their options in detail; the rest of this document will consider
+some of the common ways you might customize and extend generic views.
+
+Extending generic views
+=======================
+
+.. highlightlang:: python
+
+There's no question that using generic views can speed up development
+substantially. In most projects, however, there comes a moment when the
+generic views no longer suffice. Indeed, the most common question asked by new
+Django developers is how to make generic views handle a wider array of
+situations.
+
+Luckily, in nearly every one of these cases, there are ways to simply extend
+generic views to handle a larger array of use cases. These situations usually
+fall into a handful of patterns dealt with in the sections that follow.
+
+Making "friendly" template contexts
+-----------------------------------
+
+You might have noticed that our sample publisher list template stores all the
+books in a variable named ``object_list``. While this works just fine, it isn't
+all that "friendly" to template authors: they have to "just know" that they're
+dealing with books here. A better name for that variable would be
+``publisher_list``; that variable's content is pretty obvious.
+
+We can change the name of that variable easily with the ``template_object_name``
+argument:
+
+.. parsed-literal::
+
+ publisher_info = {
+ "queryset" : Publisher.objects.all(),
+ **"template_object_name" : "publisher",**
+ }
+
+ urlpatterns = patterns('',
+ (r'^publishers/$', list_detail.object_list, publisher_info)
+ )
+
+Providing a useful ``template_object_name`` is always a good idea. Your
+coworkers who design templates will thank you.
+
+Adding extra context
+--------------------
+
+Often you simply need to present some extra information beyond that provided by
+the generic view. For example, think of showing a list of all the other
+publishers on each publisher detail page. The ``object_detail`` generic view
+provides the publisher to the context, but it seems there's no way to get a list
+of *all* publishers in that template.
+
+But there is: all generic views take an extra optional parameter,
+``extra_context``. This is a dictionary of extra objects that will be added to
+the template's context. So, to provide the list of all publishers on the detail
+detail view, we'd use an info dict like this:
+
+.. parsed-literal::
+
+ from mysite.books.models import Publisher, **Book**
+
+ publisher_info = {
+ "queryset" : Publisher.objects.all(),
+ "template_object_name" : "publisher",
+ **"extra_context" : {"book_list" : Book.objects.all()}**
+ }
+
+This would populate a ``{{ book_list }}`` variable in the template context.
+This pattern can be used to pass any information down into the template for the
+generic view. It's very handy.
+
+However, there's actually a subtle bug here -- can you spot it?
+
+The problem has to do with when the queries in ``extra_context`` are evaluated.
+Because this example puts ``Publisher.objects.all()`` in the URLconf, it will
+be evaluated only once (when the URLconf is first loaded). Once you add or
+remove publishers, you'll notice that the generic view doesn't reflect those
+changes until you reload the Web server (see :ref:`caching-and-querysets`
+for more information about when QuerySets are cached and evaluated).
+
+.. note::
+
+ This problem doesn't apply to the ``queryset`` generic view argument. Since
+ Django knows that particular QuerySet should *never* be cached, the generic
+ view takes care of clearing the cache when each view is rendered.
+
+The solution is to use a callback in ``extra_context`` instead of a value. Any
+callable (i.e., a function) that's passed to ``extra_context`` will be evaluated
+when the view is rendered (instead of only once). You could do this with an
+explicitly defined function:
+
+.. parsed-literal::
+
+ def get_books():
+ return Book.objects.all()
+
+ publisher_info = {
+ "queryset" : Publisher.objects.all(),
+ "template_object_name" : "publisher",
+ "extra_context" : **{"book_list" : get_books}**
+ }
+
+or you could use a less obvious but shorter version that relies on the fact that
+``Book.objects.all`` is itself a callable:
+
+.. parsed-literal::
+
+ publisher_info = {
+ "queryset" : Publisher.objects.all(),
+ "template_object_name" : "publisher",
+ "extra_context" : **{"book_list" : Book.objects.all}**
+ }
+
+Notice the lack of parentheses after ``Book.objects.all``; this references
+the function without actually calling it (which the generic view will do later).
+
+Viewing subsets of objects
+--------------------------
+
+Now let's take a closer look at this ``queryset`` key we've been using all
+along. Most generic views take one of these ``queryset`` arguments -- it's how
+the view knows which set of objects to display (see :ref:`topics-db-queries` for
+more information about ``QuerySet`` objects, and see the
+:ref:`generic views reference<ref-generic-views>` for the complete details).
+
+To pick a simple example, we might want to order a list of books by
+publication date, with the most recent first:
+
+.. parsed-literal::
+
+ book_info = {
+ "queryset" : Book.objects.all().order_by("-publication_date"),
+ }
+
+ urlpatterns = patterns('',
+ (r'^publishers/$', list_detail.object_list, publisher_info),
+ **(r'^books/$', list_detail.object_list, book_info),**
+ )
+
+
+That's a pretty simple example, but it illustrates the idea nicely. Of course,
+you'll usually want to do more than just reorder objects. If you want to
+present a list of books by a particular publisher, you can use the same
+technique:
+
+.. parsed-literal::
+
+ **acme_books = {**
+ **"queryset": Book.objects.filter(publisher__name="Acme Publishing"),**
+ **"template_name" : "books/acme_list.html"**
+ **}**
+
+ urlpatterns = patterns('',
+ (r'^publishers/$', list_detail.object_list, publisher_info),
+ **(r'^books/acme/$', list_detail.object_list, acme_books),**
+ )
+
+Notice that along with a filtered ``queryset``, we're also using a custom
+template name. If we didn't, the generic view would use the same template as the
+"vanilla" object list, which might not be what we want.
+
+Also notice that this isn't a very elegant way of doing publisher-specific
+books. If we want to add another publisher page, we'd need another handful of
+lines in the URLconf, and more than a few publishers would get unreasonable.
+We'll deal with this problem in the next section.
+
+.. note::
+
+ If you get a 404 when requesting ``/books/acme/``, check to ensure you
+ actually have a Publisher with the name 'ACME Publishing'. Generic
+ views have an ``allow_empty`` parameter for this case. See the
+ :ref:`generic views reference<ref-generic-views>` for more details.
+
+Complex filtering with wrapper functions
+----------------------------------------
+
+Another common need is to filter down the objects given in a list page by some
+key in the URL. Earlier we hard-coded the publisher's name in the URLconf, but
+what if we wanted to write a view that displayed all the books by some arbitrary
+publisher? We can "wrap" the ``object_list`` generic view to avoid writing a lot
+of code by hand. As usual, we'll start by writing a URLconf:
+
+.. parsed-literal::
+
+ from mysite.books.views import books_by_publisher
+
+ urlpatterns = patterns('',
+ (r'^publishers/$', list_detail.object_list, publisher_info),
+ **(r'^books/(\w+)/$', books_by_publisher),**
+ )
+
+Next, we'll write the ``books_by_publisher`` view itself::
+
+ from django.http import Http404
+ from django.views.generic import list_detail
+ from mysite.books.models import Book, Publisher
+
+ def books_by_publisher(request, name):
+
+ # Look up the publisher (and raise a 404 if it can't be found).
+ try:
+ publisher = Publisher.objects.get(name__iexact=name)
+ except Publisher.DoesNotExist:
+ raise Http404
+
+ # Use the object_list view for the heavy lifting.
+ return list_detail.object_list(
+ request,
+ queryset = Book.objects.filter(publisher=publisher),
+ template_name = "books/books_by_publisher.html",
+ template_object_name = "books",
+ extra_context = {"publisher" : publisher}
+ )
+
+This works because there's really nothing special about generic views -- they're
+just Python functions. Like any view function, generic views expect a certain
+set of arguments and return ``HttpResponse`` objects. Thus, it's incredibly easy
+to wrap a small function around a generic view that does additional work before
+(or after; see the next section) handing things off to the generic view.
+
+.. note::
+
+ Notice that in the preceding example we passed the current publisher being
+ displayed in the ``extra_context``. This is usually a good idea in wrappers
+ of this nature; it lets the template know which "parent" object is currently
+ being browsed.
+
+Performing extra work
+---------------------
+
+The last common pattern we'll look at involves doing some extra work before
+or after calling the generic view.
+
+Imagine we had a ``last_accessed`` field on our ``Author`` object that we were
+using to keep track of the last time anybody looked at that author::
+
+ # models.py
+
+ class Author(models.Model):
+ salutation = models.CharField(max_length=10)
+ first_name = models.CharField(max_length=30)
+ last_name = models.CharField(max_length=40)
+ email = models.EmailField()
+ headshot = models.ImageField(upload_to='/tmp')
+ last_accessed = models.DateTimeField()
+
+The generic ``object_detail`` view, of course, wouldn't know anything about this
+field, but once again we could easily write a custom view to keep that field
+updated.
+
+First, we'd need to add an author detail bit in the URLconf to point to a
+custom view:
+
+.. parsed-literal::
+
+ from mysite.books.views import author_detail
+
+ urlpatterns = patterns('',
+ #...
+ **(r'^authors/(?P<author_id>\d+)/$', author_detail),**
+ )
+
+Then we'd write our wrapper function::
+
+ import datetime
+ from mysite.books.models import Author
+ from django.views.generic import list_detail
+ from django.shortcuts import get_object_or_404
+
+ def author_detail(request, author_id):
+ # Look up the Author (and raise a 404 if she's not found)
+ author = get_object_or_404(Author, pk=author_id)
+
+ # Record the last accessed date
+ author.last_accessed = datetime.datetime.now()
+ author.save()
+
+ # Show the detail page
+ return list_detail.object_detail(
+ request,
+ queryset = Author.objects.all(),
+ object_id = author_id,
+ )
+
+.. note::
+
+ This code won't actually work unless you create a
+ ``books/author_detail.html`` template.
+
+We can use a similar idiom to alter the response returned by the generic view.
+If we wanted to provide a downloadable plain-text version of the list of
+authors, we could use a view like this::
+
+ def author_list_plaintext(request):
+ response = list_detail.object_list(
+ request,
+ queryset = Author.objects.all(),
+ mimetype = "text/plain",
+ template_name = "books/author_list.txt"
+ )
+ response["Content-Disposition"] = "attachment; filename=authors.txt"
+ return response
+
+This works because the generic views return simple ``HttpResponse`` objects
+that can be treated like dictionaries to set HTTP headers. This
+``Content-Disposition`` business, by the way, instructs the browser to
+download and save the page instead of displaying it in the browser.
diff --git a/docs/topics/index.txt b/docs/topics/index.txt
index 20d7aa3061..7fa283aa1a 100644
--- a/docs/topics/index.txt
+++ b/docs/topics/index.txt
@@ -14,6 +14,7 @@ Introductions to all the key parts of Django you'll need to know:
forms/index
forms/modelforms
templates
+ generic-views
files
testing
auth
@@ -25,3 +26,4 @@ Introductions to all the key parts of Django you'll need to know:
serialization
settings
signals
+