summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt12
-rw-r--r--docs/releases/1.5.txt3
2 files changed, 13 insertions, 2 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 38668a0a2c..6f79e97a3c 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -570,8 +570,8 @@ subclass::
.. image:: _images/users_changelist.png
- ``list_filter`` should be a list of elements, where each element should be
- of one of the following types:
+ ``list_filter`` should be a list or tuple of elements, where each element
+ should be of one of the following types:
* a field name, where the specified field should be either a
``BooleanField``, ``CharField``, ``DateField``, ``DateTimeField``,
@@ -1076,6 +1076,14 @@ templates used by the :class:`ModelAdmin` views:
changelist that will be linked to the change view, as described in the
:attr:`ModelAdmin.list_display_links` section.
+.. method:: ModelAdmin.get_list_filter(self, request)
+
+ .. versionadded:: 1.5
+
+ The ``get_list_filter`` method is given the ``HttpRequest`` and is expected
+ to return the same kind of sequence type as for the
+ :attr:`~ModelAdmin.list_filter` attribute.
+
.. method:: ModelAdmin.get_inline_instances(self, request, obj=None)
.. versionadded:: 1.5
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index ca6b3acfd9..0595a226e2 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -318,6 +318,9 @@ Django 1.5 also includes several smaller improvements worth noting:
:func:`django.contrib.messages.add_message`. This is useful for generating
error messages from admin actions.
+* The admin's list filters can now be customized per-request thanks to the new
+ :meth:`django.contrib.admin.ModelAdmin.get_list_filter` method.
+
Backwards incompatible changes in 1.5
=====================================