Commit c28e700c authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Removed references to changes made in 1.2.

Thanks Florian Apolloner for the patch.
parent 6492e8e5
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ SELECTs, etc. Each time your app hits the database, the query will be recorded.
Note that the SQL recorded here may be :ref:`incorrectly quoted under SQLite
<sqlite-connection-queries>`.

.. versionadded:: 1.2

If you are using :doc:`multiple databases</topics/db/multi-db>`, you can use the
same interface on each member of the ``connections`` dictionary::

+0 −18
Original line number Diff line number Diff line
@@ -313,9 +313,6 @@ Custom database types

.. method:: Field.db_type(self, connection)

.. versionadded:: 1.2
   The ``connection`` argument was added to support multiple databases.

Returns the database column data type for the :class:`~django.db.models.Field`,
taking into account the connection object, and the settings associated with it.

@@ -452,9 +449,6 @@ Converting Python objects to query values

.. method:: Field.get_prep_value(self, value)

.. versionadded:: 1.2
   This method was factored out of ``get_db_prep_value()``

This is the reverse of :meth:`.to_python` when working with the
database backends (as opposed to serialization). The ``value``
parameter is the current value of the model's attribute (a field has
@@ -480,9 +474,6 @@ Converting query values to database values

.. method:: Field.get_db_prep_value(self, value, connection, prepared=False)

.. versionadded:: 1.2
   The ``connection`` and ``prepared`` arguments were added to support multiple databases.

Some data types (for example, dates) need to be in a specific format
before they can be used by a database backend.
:meth:`.get_db_prep_value` is the method where those conversions should
@@ -499,9 +490,6 @@ processing.

.. method:: Field.get_db_prep_save(self, value, connection)

.. versionadded:: 1.2
   The ``connection`` argument was added to support multiple databases.

Same as the above, but called when the Field value must be *saved* to
the database. As the default implementation just calls
:meth:`.get_db_prep_value`, you shouldn't need to implement this method
@@ -540,9 +528,6 @@ two phase process.

.. method:: Field.get_prep_lookup(self, lookup_type, value)

.. versionadded:: 1.2
   This method was factored out of ``get_db_prep_lookup()``

:meth:`.get_prep_lookup` performs the first phase of lookup preparation,
performing generic data validity checks

@@ -591,9 +576,6 @@ accepted lookup types to ``exact`` and ``in``::

.. method:: Field.get_db_prep_lookup(self, lookup_type, value, connection, prepared=False)

.. versionadded:: 1.2
   The ``connection`` and ``prepared`` arguments were added to support multiple databases.

Performs any database-specific data conversions required by a lookup.
As with :meth:`.get_db_prep_value`, the specific connection that will
be used for the query is passed as the ``connection`` parameter.
+0 −2
Original line number Diff line number Diff line
@@ -540,8 +540,6 @@ tag is used inside a :ttag:`{% autoescape off %}<autoescape>` block.
Thread-safety considerations
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. versionadded:: 1.2

Once a node is parsed, its ``render`` method may be called any number of times.
Since Django is sometimes run in multi-threaded environments, a single node may
be simultaneously rendering with different contexts in response to two separate
+0 −2
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ should be considered non-trivial, just ask.
Javascript patches
------------------

.. versionadded:: 1.2

Django's admin system leverages the jQuery framework to increase the
capabilities of the admin interface. In conjunction, there is an emphasis on
admin javascript performance and minimizing overall admin media file size.
+5 −35
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ subclass::

.. attribute:: ModelAdmin.actions_selection_counter

    .. versionadded:: 1.2

    Controls whether a selection counter is display next to the action dropdown.
    By default, the admin changelist will display it
    (``actions_selection_counter = True``).
@@ -177,12 +175,9 @@ subclass::
            fields = ('url', 'title', 'content')

    In the above example, only the fields ``url``, ``title`` and ``content``
    will be displayed, sequentially, in the form.

    .. versionadded:: 1.2

    ``fields`` can contain values defined in :attr:`ModelAdmin.readonly_fields`
    to be displayed as read-only.
    will be displayed, sequentially, in the form. ``fields`` can contain
    values defined in :attr:`ModelAdmin.readonly_fields` to be displayed as
    read-only.

    .. versionadded:: 1.4

@@ -262,8 +257,6 @@ subclass::
            'fields': (('first_name', 'last_name'), 'address', 'city', 'state'),
            }

        .. versionadded:: 1.2

        ``fields`` can contain values defined in
        :attr:`~ModelAdmin.readonly_fields` to be displayed as read-only.

@@ -380,8 +373,6 @@ subclass::

.. attribute:: ModelAdmin.get_changelist

    .. versionchanged:: 1.2

    Returns the Changelist class to be used for listing. By default,
    ``django.contrib.admin.views.main.ChangeList`` is used. By inheriting this
    class you can change the behavior of the listing.
@@ -819,8 +810,6 @@ subclass::

.. attribute:: ModelAdmin.readonly_fields

    .. versionadded:: 1.2

    By default the admin shows all fields as editable. Any fields in this
    option (which should be a ``list`` or ``tuple``) will display its data
    as-is and non-editable. This option behaves nearly identical to
@@ -928,8 +917,6 @@ templates used by the :class:`ModelAdmin` views:

.. attribute:: ModelAdmin.add_form_template

    .. versionadded:: 1.2

    Path to a custom template, used by :meth:`add_view`.

.. attribute:: ModelAdmin.change_form_template
@@ -947,8 +934,6 @@ templates used by the :class:`ModelAdmin` views:

.. attribute:: ModelAdmin.delete_selected_confirmation_template

    .. versionadded:: 1.2

    Path to a custom template, used by the :meth:`delete_selected`
    action method for displaying a confirmation page when deleting one
    or more objects. See the :doc:`actions
@@ -1035,8 +1020,6 @@ templates used by the :class:`ModelAdmin` views:

.. method:: ModelAdmin.get_readonly_fields(self, request, obj=None)

    .. versionadded:: 1.2

    The ``get_readonly_fields`` method is given the ``HttpRequest`` and the
    ``obj`` being edited (or ``None`` on an add form) and is expected to return
    a ``list`` or ``tuple`` of field names that will be displayed as read-only,
@@ -1405,20 +1388,17 @@ adds some of its own (the shared features are actually defined in the
- :attr:`~InlineModelAdmin.form`
- :attr:`~ModelAdmin.fieldsets`
- :attr:`~ModelAdmin.fields`
- :attr:`~ModelAdmin.formfield_overrides`
- :attr:`~ModelAdmin.exclude`
- :attr:`~ModelAdmin.filter_horizontal`
- :attr:`~ModelAdmin.filter_vertical`
- :attr:`~ModelAdmin.prepopulated_fields`
- :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.2

- :attr:`~ModelAdmin.readonly_fields`
- :attr:`~ModelAdmin.formfield_overrides`

.. versionadded:: 1.3

- :attr:`~ModelAdmin.ordering`
@@ -1463,8 +1443,6 @@ The ``InlineModelAdmin`` class adds:
    :doc:`formsets documentation </topics/forms/formsets>` for more
    information.

    .. versionadded:: 1.2

    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.
@@ -1541,8 +1519,6 @@ automatically::
Working with many-to-many models
--------------------------------

.. versionadded:: 1.2

By default, admin widgets for many-to-many relations will be displayed
on whichever model contains the actual reference to the
:class:`~django.db.models.ManyToManyField`. Depending on your ``ModelAdmin``
@@ -1842,21 +1818,15 @@ Templates can override or extend base admin templates as described in

.. attribute:: AdminSite.logout_template

    .. versionadded:: 1.2

    Path to a custom template that will be used by the admin site logout view.

.. attribute:: AdminSite.password_change_template

    .. versionadded:: 1.2

    Path to a custom template that will be used by the admin site password
    change view.

.. attribute:: AdminSite.password_change_done_template

    .. versionadded:: 1.2

    Path to a custom template that will be used by the admin site password
    change done view.

Loading