diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-08-09 21:08:00 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-08-09 21:08:00 +0000 |
| commit | 4f00611f747b566cb7586f02462e57829424f077 (patch) | |
| tree | 8977304e1ad1a929815c6c0d4696f041c53094df /docs | |
| parent | e79eb09f2169ba9497283ab1a9e31c49e857fa93 (diff) | |
Fixed #211 -- edit_inline_type is deprecated, in favor of edit_inline itself. For example, instead of 'edit_inline=True, edit_inline_type=meta.TABULAR', use 'edit_inline=meta.TABULAR'.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/db-api.txt | 2 | ||||
| -rw-r--r-- | docs/model-api.txt | 13 | ||||
| -rw-r--r-- | docs/tutorial02.txt | 8 |
3 files changed, 10 insertions, 13 deletions
diff --git a/docs/db-api.txt b/docs/db-api.txt index 02faa8a484..40fe40a64d 100644 --- a/docs/db-api.txt +++ b/docs/db-api.txt @@ -20,7 +20,7 @@ Throughout this reference, we'll refer to the following Poll application:: class Choice(meta.Model): fields = ( - meta.ForeignKey(Poll, edit_inline=True, edit_inline_type=meta.TABULAR, + meta.ForeignKey(Poll, edit_inline=meta.TABULAR, num_in_admin=10, min_num_in_admin=5), meta.CharField('choice', maxlength=255, core=True), meta.IntegerField('votes', editable=False, default=0), diff --git a/docs/model-api.txt b/docs/model-api.txt index f071c1bfcb..7b93032919 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -316,16 +316,13 @@ Field Types ======================= ============================================================ Argument Description ======================= ============================================================ - ``edit_inline`` If ``True``, this related object is edited + ``edit_inline`` If not ``False``, this related object is edited "inline" on the related object's page. This means that the object will not have its own admin - interface. - - ``edit_inline_type`` This is either ``meta.TABULAR`` or - ``meta.STACKED`` and controls whether the inline - editable objects are displayed as a table or as - a "stack" of fieldsets. Defaults to - ``meta.STACKED``. + interface. Use either ``meta.TABULAR`` or ``meta.STACKED``, + which, respectively, designate whether the inline-editable + objects are displayed as a table or as a "stack" of + fieldsets. ``limit_choices_to`` A dictionary of lookup arguments and values (see the `Database API reference`_) that limit the diff --git a/docs/tutorial02.txt b/docs/tutorial02.txt index b932aea4f0..d084e2b748 100644 --- a/docs/tutorial02.txt +++ b/docs/tutorial02.txt @@ -242,7 +242,7 @@ Poll object. Let's make that happen. Remove the ``admin`` for the Choice model. Then, edit the ``ForeignKey(Poll)`` field like so:: - meta.ForeignKey(Poll, edit_inline=True, num_in_admin=3), + meta.ForeignKey(Poll, edit_inline=meta.STACKED, num_in_admin=3), This tells Django: "Choice objects are edited on the Poll admin page. By default, provide enough fields for 3 Choices." @@ -274,10 +274,10 @@ One small problem, though. It takes a lot of screen space to display all the fields for entering related Choice objects. For that reason, Django offers an alternate way of displaying inline related objects:: - meta.ForeignKey(Poll, edit_inline=True, num_in_admin=3, edit_inline_type=meta.TABULAR), + meta.ForeignKey(Poll, edit_inline=meta.TABULAR, num_in_admin=3), -With that ``edit_inline_type=meta.TABULAR``, the related objects are displayed -in a more compact, table-based format: +With that ``edit_inline=meta.TABULAR`` (instead of ``meta.STACKED``), the +related objects are displayed in a more compact, table-based format: .. image:: http://media.djangoproject.com/img/doc/tutorial/admin12.png :alt: Add poll page now has more compact choices |