summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2011-02-21 21:20:41 +0000
committerLuke Plant <L.Plant.98@cantab.net>2011-02-21 21:20:41 +0000
commit31d0f2fa29b766d4e739e8ad650b43435b48dfbf (patch)
tree86183cdefa2a5c7035bf0019d03cf76983adbead /docs
parent25c217bc170d275a2db65fd9c9faa064797d4b2f (diff)
[1.2.X] Fixed #11058 - list_display_links doesn't allow callables not defined in the model
Thanks to dvine for the report and julien for the patch. Backport of [15619] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 7dde9ecae6..18ea121d40 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -408,12 +408,12 @@ subclass::
By default, the change list page will link the first column -- the first
field specified in ``list_display`` -- to the change page for each item.
- But``list_display_links`` lets you change which columns are linked. Set
- ``list_display_links`` to a list or tuple of field names (in the same
+ But ``list_display_links`` lets you change which columns are linked. Set
+ ``list_display_links`` to a list or tuple of fields (in the same
format as ``list_display``) to link.
- ``list_display_links`` can specify one or many field names. As long as the
- field names appear in ``list_display``, Django doesn't care how many (or
+ ``list_display_links`` can specify one or many fields. As long as the
+ fields appear in ``list_display``, Django doesn't care how many (or
how few) fields are linked. The only requirement is: If you want to use
``list_display_links``, you must define ``list_display``.