Fixed #14650 -- noted that underscores are also valid in slug fields. Thanks to stringify for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
7a5c54e9b7
commit
60ad315bc9
|
@ -682,8 +682,8 @@ and the error message as the value.
|
||||||
* Default widget: ``TextInput``
|
* Default widget: ``TextInput``
|
||||||
* Empty value: ``''`` (an empty string)
|
* Empty value: ``''`` (an empty string)
|
||||||
* Normalizes to: A Unicode object.
|
* Normalizes to: A Unicode object.
|
||||||
* Validates that the given value contains only letters, numbers and
|
* Validates that the given value contains only letters, numbers,
|
||||||
hyphens.
|
underscores, and hyphens.
|
||||||
* Error messages: ``required``, ``invalid``
|
* Error messages: ``required``, ``invalid``
|
||||||
|
|
||||||
This field is intended for use in representing a model
|
This field is intended for use in representing a model
|
||||||
|
@ -910,11 +910,11 @@ example::
|
||||||
.. class:: ModelMultipleChoiceField(**kwargs)
|
.. class:: ModelMultipleChoiceField(**kwargs)
|
||||||
|
|
||||||
* Default widget: ``SelectMultiple``
|
* Default widget: ``SelectMultiple``
|
||||||
* Empty value: ``[]`` (an empty list)
|
* Empty value: ``[]`` (an empty list)
|
||||||
* Normalizes to: A list of model instances.
|
* Normalizes to: A list of model instances.
|
||||||
* Validates that every id in the given list of values exists in the
|
* Validates that every id in the given list of values exists in the
|
||||||
queryset.
|
queryset.
|
||||||
* Error message keys: ``required``, ``list``, ``invalid_choice``,
|
* Error message keys: ``required``, ``list``, ``invalid_choice``,
|
||||||
``invalid_pk_value``
|
``invalid_pk_value``
|
||||||
|
|
||||||
Allows the selection of one or more model objects, suitable for
|
Allows the selection of one or more model objects, suitable for
|
||||||
|
|
Loading…
Reference in New Issue