Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Fixed #14307 -- Linked ChoiceField.choices docs to Field.choi…

…ces docs to explain the formatting options available. Thanks to adamv for the report and Russ for the suggested fix.

Backport of [14231] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 560f58aba3be6a23698008600a87dc0bcd747fd7 1 parent d0a056b
Gabriel Hurley authored
Showing with 5 additions and 1 deletion.
  1. +5 −1 docs/ref/forms/fields.txt
View
6 docs/ref/forms/fields.txt
@@ -352,7 +352,11 @@ Takes one extra required argument:
.. attribute:: ChoiceField.choices
An iterable (e.g., a list or tuple) of 2-tuples to use as choices for this
- field.
+ field. This argument accepts the same formats as the ``choices`` argument
+ to a model field. See the `model field reference documentation on choices`_
+ for more details.
+
+ .. _model field reference documentation on choices: ../models/fields#choices
``TypedChoiceField``
~~~~~~~~~~~~~~~~~~~~
Please sign in to comment.
Something went wrong with that request. Please try again.