mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00
Code Issues Releases Wiki Activity

Complemented documentation following commit be9ae693c

Browse Source 
Refs #17840. Thanks Carl Meyer for noticing the omission.
This commit is contained in:
Claude Paroz 2013-04-18 20:38:07 +02:00
parent 9f7b277d2e
commit 5306285ce2
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/ref/forms/fields.txt
View File

@ -467,6 +467,10 @@ For each field, we describe the default widget used if you don't specify
The ``max_value`` and ``min_value`` error messages may contain The ``max_value`` and ``min_value`` error messages may contain
``%(limit_value)s``, which will be substituted by the appropriate limit. ``%(limit_value)s``, which will be substituted by the appropriate limit.
.. versionchanged:: 1.6
Similarly, the ``max_digits``, ``max_decimal_places`` and
``max_whole_digits`` error messages may contain ``%(max)s``.
Takes four optional arguments: Takes four optional arguments:
.. attribute:: max_value .. attribute:: max_value
@ -1013,6 +1017,11 @@ objects (in the case of ``ModelMultipleChoiceField``) into the
The empty and normalized values were changed to be consistently The empty and normalized values were changed to be consistently
``QuerySets`` instead of ``[]`` and ``QuerySet`` respectively. ``QuerySets`` instead of ``[]`` and ``QuerySet`` respectively.
.. versionchanged:: 1.6
The ``invalid_choice`` message may contain ``%(value)s`` and the
``invalid_pk_value`` message may contain ``%(pk)s``, which will be
substituted by the appropriate values.
Allows the selection of one or more model objects, suitable for Allows the selection of one or more model objects, suitable for
representing a many-to-many relation. As with :class:`ModelChoiceField`, representing a many-to-many relation. As with :class:`ModelChoiceField`,
you can use ``label_from_instance`` to customize the object you can use ``label_from_instance`` to customize the object

7
docs/releases/1.6.txt
View File

@ -423,6 +423,13 @@ Miscellaneous
``type='email'``, ``type='url'`` or ``type='number'`` depending on their ``type='email'``, ``type='url'`` or ``type='number'`` depending on their
corresponding field type. corresponding field type.
* Form field's :attr:`~django.forms.Field.error_messages` that contain a
placeholder should now always use a named placeholder (``"Value '%(value)s' is
too big"`` instead of ``"Value '%s' is too big"``). See the corresponding
field documentation for details about the names of the placeholders. The
changes in 1.6 particularly affect :class:`~django.forms.DecimalField` and
:class:`~django.forms.ModelMultipleChoiceField`.
Features deprecated in 1.6 Features deprecated in 1.6
========================== ==========================