From 10f8a2100279621ca0e0fa47d99ee744741a05e7 Mon Sep 17 00:00:00 2001 From: Preston Holmes Date: Wed, 24 Jul 2013 14:58:14 -0700 Subject: [PATCH] Fixed #18168 -- clarified precedence of validation any choices set by formfield_for_choice_field are still subject to model validation of the model field's choices attribute --- docs/ref/contrib/admin/index.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index e5e9428805..137d20a351 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -1389,6 +1389,15 @@ templates used by the :class:`ModelAdmin` views: kwargs['choices'] += (('ready', 'Ready for deployment'),) return super(MyModelAdmin, self).formfield_for_choice_field(db_field, request, **kwargs) + .. admonition:: Note + + Any ``choices`` attribute set on the formfield will limited to the form + field only. If the corresponding field on the model has choices set, + the choices provided to the form must be a valid subset of those + choices, otherwise the form submission will fail with + a :exc:`~django.core.exceptions.ValidationError` when the model itself + is validated before saving. + .. method:: ModelAdmin.get_changelist(self, request, **kwargs) Returns the ``Changelist`` class to be used for listing. By default,