[1.2.X] Fixed #14650 -- noted that underscores are also valid in slug fields. Thanks to stringify for the report and patch. Backport of [14503].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2010-11-09 05:19:17 +00:00
parent caf51bfcd4
commit 66c72b1f80
1 changed files with 4 additions and 4 deletions

View File

@ -682,8 +682,8 @@ and the error message as the value.
* Default widget: ``TextInput``
* Empty value: ``''`` (an empty string)
* Normalizes to: A Unicode object.
* Validates that the given value contains only letters, numbers and
hyphens.
* Validates that the given value contains only letters, numbers,
underscores, and hyphens.
* Error messages: ``required``, ``invalid``
This field is intended for use in representing a model
@ -910,11 +910,11 @@ example::
.. class:: ModelMultipleChoiceField(**kwargs)
* Default widget: ``SelectMultiple``
* Empty value: ``[]`` (an empty list)
* Empty value: ``[]`` (an empty list)
* Normalizes to: A list of model instances.
* Validates that every id in the given list of values exists in the
queryset.
* Error message keys: ``required``, ``list``, ``invalid_choice``,
* Error message keys: ``required``, ``list``, ``invalid_choice``,
``invalid_pk_value``
Allows the selection of one or more model objects, suitable for