summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCollin Anderson <cmawebsite@gmail.com>2014-12-27 02:16:53 -0500
committerLoic Bistuer <loic.bistuer@gmail.com>2015-01-17 22:09:10 +0700
commita420f83e7d2e446ca01ef7c13d30c2ef3e975e5c (patch)
treec3c6aed2cd6c160d2f75e2f6f3f9d8c0b08d8ce7 /docs
parent67235fd4ef1b006fc9cdb2fa20e7bb93b0edff4b (diff)
Fixed #24055 -- Keep reference to view class for resolve()
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/class-based-views/base.txt5
-rw-r--r--docs/ref/contrib/admin/index.txt5
-rw-r--r--docs/releases/1.9.txt8
3 files changed, 17 insertions, 1 deletions
diff --git a/docs/ref/class-based-views/base.txt b/docs/ref/class-based-views/base.txt
index 523b39d0e2..2c90cd4893 100644
--- a/docs/ref/class-based-views/base.txt
+++ b/docs/ref/class-based-views/base.txt
@@ -65,6 +65,11 @@ View
response = MyView.as_view()(request)
+ .. versionadded:: 1.9
+
+ The returned view has ``view_class`` and ``view_initkwargs``
+ attributes.
+
.. method:: dispatch(request, *args, **kwargs)
The ``view`` part of the view -- the method that accepts a ``request``
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index bb72f3fe55..317d48f351 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1490,6 +1490,11 @@ templates used by the :class:`ModelAdmin` views:
url(r'^my_view/$', self.admin_site.admin_view(self.my_view, cacheable=True))
+ .. versionadded:: 1.9
+
+ ``ModelAdmin`` views have ``model_admin`` attributes. Other
+ ``AdminSite`` views have ``admin_site`` attributes.
+
.. method:: ModelAdmin.get_form(request, obj=None, **kwargs)
Returns a :class:`~django.forms.ModelForm` class for use in the admin add
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 80ad57c053..1ff4022c7d 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -33,7 +33,7 @@ Minor features
:mod:`django.contrib.admin`
^^^^^^^^^^^^^^^^^^^^^^^^^^^
-* ...
+* Admin views now have ``model_admin`` or ``admin_site`` attributes.
:mod:`django.contrib.auth`
^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -108,6 +108,12 @@ Forms
* ...
+Generic Views
+^^^^^^^^^^^^^
+
+* Class based views generated using ``as_view()`` now have ``view_class``
+ and ``view_initkwargs`` attributes.
+
Internationalization
^^^^^^^^^^^^^^^^^^^^