From bb9c9103e57c7cb09a7d5eb45312ca8808c7a413 Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Mon, 12 Dec 2016 00:51:23 -0500 Subject: [PATCH] [1.10.x] Doc'd how ModelAdmin.list_display uses short_description. Backport of 8ab8a8910c6f9382610cba5b06ac5c110d52b4b2 from master --- docs/ref/contrib/admin/index.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index c3c033f7d9..ef1f66e096 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -634,6 +634,10 @@ subclass:: :func:`~django.utils.html.format_html_join`, or :func:`~django.utils.safestring.mark_safe` instead. + * As some examples have already demonstrated, when using a callable, a + model method, or a ``ModelAdmin`` method, you can customize the column's + title by adding a ``short_description`` attribute to the callable. + * If the value of a field is ``None``, an empty string, or an iterable without elements, Django will display ``-`` (a dash). You can override this with :attr:`AdminSite.empty_value_display`::