summaryrefslogtreecommitdiff
path: root/docs/ref/contrib/admin
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-05-12 11:56:42 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-05-12 11:56:42 +0000
commitd0d3e6792da9e716e547f23dfd44706d2bab3c8e (patch)
treea02c95cf79ca18be8bd18d3777e99dac391c58f5 /docs/ref/contrib/admin
parentb8ed8279529fecd408a3043e205aced6f7d23089 (diff)
Fixed #13524 -- Added backwards compatibility and feature notes regarding admin inlines and formsets. Thanks to Ramiro Morales and Gabriel Hurley.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/contrib/admin')
-rw-r--r--docs/ref/contrib/admin/index.txt13
1 files changed, 11 insertions, 2 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index cb87ebb1a2..7f972b224f 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1053,6 +1053,8 @@ The value for ``form`` defaults to ``ModelForm``. This is what is
passed through to ``inlineformset_factory`` when creating the formset for this
inline.
+.. _ref-contrib-admin-inline-extra:
+
``extra``
~~~~~~~~~
@@ -1062,8 +1064,15 @@ to the initial forms. See the
.. versionadded:: 1.2
-Extra forms for inlines will be hidden and replaced with a link to dynamically
-add any number of new inlines for users with Javascript enabled.
+For users with JavaScript-enabled browsers, an "Add another" link is
+provided to enable any number of additional inlines to be added in
+addition to those provided as a result of the ``extra`` argument.
+
+The dynamic link will not appear if the number of currently displayed
+forms exceeds ``max_num``, or if the user does not have JavaScript
+enabled.
+
+.. _ref-contrib-admin-inline-max-num:
``max_num``
~~~~~~~~~~~