summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt6
-rw-r--r--docs/releases/1.4.txt8
2 files changed, 11 insertions, 3 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index e5aecb4622..3ba3b1b0eb 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -696,10 +696,10 @@ subclass::
If this isn't provided, the Django admin will use the model's default
ordering.
- .. admonition:: Note
+ .. versionchanged:: 1.4
- Django will only honor the first element in the list/tuple; any others
- will be ignored.
+ Django honors all elements in the list/tuple; before 1.4, only the first
+ was respected.
.. attribute:: ModelAdmin.paginator
diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt
index 2a2090a9b1..d0c02b0036 100644
--- a/docs/releases/1.4.txt
+++ b/docs/releases/1.4.txt
@@ -46,6 +46,14 @@ not custom filters. This has been rectified with a simple API previously
known as "FilterSpec" which was used internally. For more details, see the
documentation for :attr:`~django.contrib.admin.ModelAdmin.list_filter`.
+Multiple sort in admin interface
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The admin change list now supports sorting on multiple columns. It respects all
+elements of the :attr:`~django.contrib.admin.ModelAdmin.ordering` attribute, and
+sorting on multiple columns by clicking on headers is designed to work similarly
+to how desktop GUIs do it.
+
Tools for cryptographic signing
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~