diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2010-03-08 18:41:26 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2010-03-08 18:41:26 +0000 |
| commit | 75b10c9c15e81c57b09b7f4c70054da4bb83f703 (patch) | |
| tree | c221658c353ab116cf738d21f555b154e7bab8ac /docs/ref | |
| parent | 758123a1f9b05cc3a5046311def90c9f2b1b3dbe (diff) | |
[1.1.X] Fixed #12024: Changed admin code to avoid raising an exception when a field listed
in raw_id_fields has limit_choices_to specified as a Q object.
Tweaked a test to trigger the condition and verify the fix.
Finally, documented that limit_choices_to specified as a Q object has no effect
on the choices available for fields listed in raw_id_fields, and removed another
incorrect note that claimed limit_choices_to had no effect on inlines in the admin.
r12728 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/models/fields.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index b25bcb1dc2..f6709a8626 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -844,10 +844,10 @@ define the details of how the relation works. current date/time to be chosen. Instead of a dictionary this can also be a :class:`~django.db.models.Q` - object for more :ref:`complex queries <complex-lookups-with-q>`. - - ``limit_choices_to`` has no effect on the inline FormSets that are created - to display related objects in the admin. + object for more :ref:`complex queries <complex-lookups-with-q>`. However, + if ``limit_choices_to`` is a :class:`~django.db.models.Q` object then it + will only have an effect on the choices available in the admin when the + field is not listed in ``raw_id_fields`` in the ``ModelAdmin`` for the model. .. attribute:: ForeignKey.related_name |