From aa5230c4be0a03153206397b191a1e79cae9ecd3 Mon Sep 17 00:00:00 2001 From: Julien Phalip Date: Mon, 21 Nov 2011 06:07:24 +0000 Subject: [PATCH] Fixed #17269 -- Corrected the model options doc to indicate that, since 1.4, all fields in `Meta.ordering` are honored by the admin. Thanks to sebastian for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17130 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/models/options.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt index 4ae105af92..6bbfa30a53 100644 --- a/docs/ref/models/options.txt +++ b/docs/ref/models/options.txt @@ -189,11 +189,6 @@ Django quotes column and table names behind the scenes. "-" prefix, which indicates descending order. Fields without a leading "-" will be ordered ascending. Use the string "?" to order randomly. - .. note:: - - Regardless of how many fields are in :attr:`~Options.ordering`, the admin - site uses only the first field. - For example, to order by a ``pub_date`` field ascending, use this:: ordering = ['pub_date'] @@ -206,6 +201,10 @@ Django quotes column and table names behind the scenes. ordering = ['-pub_date', 'author'] + .. versionchanged:: 1.4 + The Django admin honors all elements in the list/tuple; before 1.4, only + the first one was respected. + ``permissions`` ---------------