summaryrefslogtreecommitdiff
path: root/docs/ref/contrib/admin
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2012-09-19 16:39:14 -0400
committerTim Graham <timograham@gmail.com>2012-09-20 19:06:55 -0400
commit837425b425c2d58596f3ed04a7ed79541279ee7e (patch)
tree9e9f7719e645d872638f189979f29d4c89ae5399 /docs/ref/contrib/admin
parente06b54391dd06a0448b7676ec38f3734a4f86300 (diff)
Fixed #18934 - Removed versionadded/changed annotations for Django 1.3
Diffstat (limited to 'docs/ref/contrib/admin')
-rw-r--r--docs/ref/contrib/admin/index.txt21
1 files changed, 2 insertions, 19 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 66a5a2cc4f..2aabc55908 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -129,8 +129,6 @@ subclass::
date_hierarchy = 'pub_date'
- .. versionadded:: 1.3
-
This will intelligently populate itself based on available data,
e.g. if all the dates are in one month, it'll show the day-level
drill-down only.
@@ -576,8 +574,6 @@ subclass::
class PersonAdmin(ModelAdmin):
list_filter = ('is_staff', 'company')
- .. versionadded:: 1.3
-
Field names in ``list_filter`` can also span relations
using the ``__`` lookup, for example::
@@ -748,8 +744,6 @@ subclass::
.. attribute:: ModelAdmin.paginator
- .. versionadded:: 1.3
-
The paginator class to be used for pagination. By default,
:class:`django.core.paginator.Paginator` is used. If the custom paginator
class doesn't have the same constructor interface as
@@ -966,8 +960,6 @@ templates used by the :class:`ModelAdmin` views:
.. method:: ModelAdmin.delete_model(self, request, obj)
- .. versionadded:: 1.3
-
The ``delete_model`` method is given the ``HttpRequest`` and a model
instance. Use this method to do pre- or post-delete operations.
@@ -1213,8 +1205,6 @@ templates used by the :class:`ModelAdmin` views:
.. method:: ModelAdmin.get_paginator(queryset, per_page, orphans=0, allow_empty_first_page=True)
- .. versionadded:: 1.3
-
Returns an instance of the paginator to use for this view. By default,
instantiates an instance of :attr:`paginator`.
@@ -1295,8 +1285,6 @@ on your ``ModelAdmin``::
}
js = ("my_code.js",)
-.. versionchanged:: 1.3
-
The :doc:`staticfiles app </ref/contrib/staticfiles>` prepends
:setting:`STATIC_URL` (or :setting:`MEDIA_URL` if :setting:`STATIC_URL` is
``None``) to any media paths. The same rules apply as :ref:`regular media
@@ -1394,18 +1382,15 @@ adds some of its own (the shared features are actually defined in the
- :attr:`~ModelAdmin.exclude`
- :attr:`~ModelAdmin.filter_horizontal`
- :attr:`~ModelAdmin.filter_vertical`
+- :attr:`~ModelAdmin.ordering`
- :attr:`~ModelAdmin.prepopulated_fields`
+- :meth:`~ModelAdmin.queryset`
- :attr:`~ModelAdmin.radio_fields`
- :attr:`~ModelAdmin.readonly_fields`
- :attr:`~InlineModelAdmin.raw_id_fields`
- :meth:`~ModelAdmin.formfield_for_foreignkey`
- :meth:`~ModelAdmin.formfield_for_manytomany`
-.. versionadded:: 1.3
-
-- :attr:`~ModelAdmin.ordering`
-- :meth:`~ModelAdmin.queryset`
-
.. versionadded:: 1.4
- :meth:`~ModelAdmin.has_add_permission`
@@ -1813,8 +1798,6 @@ Templates can override or extend base admin templates as described in
.. attribute:: AdminSite.login_form
- .. versionadded:: 1.3
-
Subclass of :class:`~django.contrib.auth.forms.AuthenticationForm` that
will be used by the admin site login view.