Commit 24aa08f4 authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

Refs #7864 -- Updates to documentation for the oldforms/newforms switch.

 * Moved forms.txt to oldforms.txt
 * Moved newforms.txt to forms.txt
 * Updated links and most references to "newforms" (there are a few sections that need a more significant rewrite).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f2847454
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ Requires the sites_ contrib package to be installed as well.
formtools
=========

A set of high-level abstractions for Django forms (django.newforms).
A set of high-level abstractions for Django forms (django.forms).

django.contrib.formtools.preview
--------------------------------
+1 −1
Original line number Diff line number Diff line
@@ -115,6 +115,6 @@ change:
.. _template language: ../templates/
.. _transactions: ../transactions/
.. _url dispatch: ../url_dispatch/
.. _forms and validation: ../forms/
.. _forms and validation: ../oldforms/
.. _serialization: ../serialization/
.. _authentication: ../authentication/
+2 −2
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ It's your responsibility to provide the login form in a template called
template context variables:

    * ``form``: A ``Form`` object representing the login form. See the
      `newforms documentation`_ for more on ``Form`` objects.
      `forms documentation`_ for more on ``FormWrapper`` objects.
    * ``next``: The URL to redirect to after successful login. This may contain
      a query string, too.
    * ``site_name``: The name of the current ``Site``, according to the
@@ -557,7 +557,7 @@ block::

    {% endblock %}

.. _newforms documentation: ../newforms/
.. _forms documentation: ../forms/
.. _site framework docs: ../sites/

Other built-in views
+3 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ into the precise details of what ``Field`` can do later on; for now, suffice it
to say that everything descends from ``Field`` and then customizes key pieces
of the class behavior.

.. _form fields: ../newforms/#fields
.. _form fields: ../forms/#fields

It's important to realize that a Django field class is not what is stored in
your model attributes. The model attributes contain normal Python objects. The
@@ -493,8 +493,8 @@ This assumes we're imported a ``MyFormField`` field class (which has its own
default widget). This document doesn't cover the details of writing custom form
fields.

.. _helper functions: ../newforms/#generating-forms-for-models
.. _forms documentation: ../newforms/
.. _helper functions: ../forms/#generating-forms-for-models
.. _forms documentation: ../forms/

``get_internal_type(self)``
~~~~~~~~~~~~~~~~~~~~~~~~~~~
+7 −7
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ For this reason, Django provides a few helper functions that let you create a
``form_for_model()``
--------------------

The method ``django.newforms.form_for_model()`` creates a form based on the
The method ``django.forms.form_for_model()`` creates a form based on the
definition of a specific model. Pass it the model class, and it will return a
``Form`` class that contains a form field for each model field.

For example::

    >>> from django.newforms import form_for_model
    >>> from django.forms import form_for_model

    # Create the form class.
    >>> ArticleForm = form_for_model(Article)
@@ -93,11 +93,11 @@ the full list of conversions:
As you might expect, the ``ForeignKey`` and ``ManyToManyField`` model field
types are special cases:

    * ``ForeignKey`` is represented by ``django.newforms.ModelChoiceField``,
    * ``ForeignKey`` is represented by ``django.forms.ModelChoiceField``,
      which is a ``ChoiceField`` whose choices are a model ``QuerySet``.

    * ``ManyToManyField`` is represented by
      ``django.newforms.ModelMultipleChoiceField``, which is a
      ``django.forms.ModelMultipleChoiceField``, which is a
      ``MultipleChoiceField`` whose choices are a model ``QuerySet``.

In addition, each generated form field has attributes set as follows:
@@ -228,7 +228,7 @@ Using an alternate base class
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

If you want to add custom methods to the form generated by
``form_for_model()``, write a class that extends ``django.newforms.BaseForm``
``form_for_model()``, write a class that extends ``django.forms.BaseForm``
and contains your custom methods. Then, use the ``form`` argument to
``form_for_model()`` to tell it to use your custom form as its base class.
For example::
@@ -412,8 +412,8 @@ note is that the form display in the ``GET`` branch of the function
will use the values from the ``message`` instance as initial values for the
form field.

.. _contact form: ../newforms/#simple-view-example
.. _`simple example view`: ../newforms/#simple-view-example
.. _contact form: ../forms/#simple-view-example
.. _`simple example view`: ../forms/#simple-view-example

When should you use ``form_for_model()`` and ``form_for_instance()``?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Loading