diff options
| author | Claude Paroz <claude@2xlibre.net> | 2020-10-17 16:17:00 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-10-17 21:01:54 +0200 |
| commit | 8caf524a1dd35d57827dff6950460f9d8b9d2dab (patch) | |
| tree | fa3a626a6c9617ea573efa58d5a8e1ee401f0f5a /docs | |
| parent | be3ce38656f9b5799e15b92cec30392132e104d1 (diff) | |
[3.1.x] Fixed #32110 -- Doc'd and tested enumerations for ChoiceField.choices.
Backport of 7f85498eef1d8fcc52e4fb70df8041f5452d405a from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/forms/fields.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 0bcf07ff08..44ccdbf765 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -410,12 +410,13 @@ For each field, we describe the default widget used if you don't specify .. attribute:: choices Either an :term:`iterable` of 2-tuples to use as choices for this - field, or a callable that returns such an iterable. This argument - accepts the same formats as the ``choices`` argument to a model field. - See the :ref:`model field reference documentation on choices - <field-choices>` for more details. If the argument is a callable, it is - evaluated each time the field's form is initialized, in addition to - during rendering. Defaults to an empty list. + field, :ref:`enumeration <field-choices-enum-types>` choices, or a + callable that returns such an iterable. This argument accepts the same + formats as the ``choices`` argument to a model field. See the + :ref:`model field reference documentation on choices <field-choices>` + for more details. If the argument is a callable, it is evaluated each + time the field's form is initialized, in addition to during rendering. + Defaults to an empty list. ``TypedChoiceField`` -------------------- |
