Commit 722683f5 authored by Tim Graham's avatar Tim Graham
Browse files

Fixed #19887 - Noted when callables may be used in ModelAdmin.fields and ModelAdmin.fieldset. 

Thanks Patrick Strasser for the suggestion and Zbigniew Siciarz for the patch.
parent 1b7fb29d

docs/ref/contrib/admin/index.txt

+9 −0
Original line number Diff line number Diff line
@@ -186,6 +186,11 @@ subclass:: 
    values defined in :attr:`ModelAdmin.readonly_fields` to be displayed as

    read-only.



    The ``fields`` option, unlike :attr:`~ModelAdmin.list_display`, may contain

    only field names of the model or the form specified by

    :attr:`~ModelAdmin.form`, not callables. However it *can* contain callables

    if they are defined in :attr:`~ModelAdmin.readonly_fields`.



    To display multiple fields on the same line, wrap those fields in their own

    tuple. In this example, the ``url`` and ``title`` fields will display on the

    same line and the ``content`` field will be displayed below them in its
@@ -265,6 +270,10 @@ subclass:: 
        ``fields`` can contain values defined in

        :attr:`~ModelAdmin.readonly_fields` to be displayed as read-only.



        If you add a callable name to ``fields``, the same rule applies as

        with :attr:`~ModelAdmin.fields` option: the callable must be

        specified in :attr:`~ModelAdmin.readonly_fields`.



    * ``classes``

        A list containing extra CSS classes to apply to the fieldset.