1
0
mirror of https://github.com/django/django.git synced 2025-10-25 22:56:12 +00:00

[1.6.x] Fixed #22113 -- changed object_name to model_name in CBV docs.

Thanks to trac user nikunj.sg for the report.

Backport of b887408486 from master.
This commit is contained in:
Marcin Sokół
2014-02-22 17:54:32 +01:00
committed by Baptiste Mispelon
parent a36513c2b4
commit 79cc1fa58d
4 changed files with 7 additions and 7 deletions

View File

@@ -148,7 +148,7 @@ MultipleObjectMixin
the list of data that this view is manipulating. If
``object_list`` is a queryset of Django objects and
:attr:`context_object_name` is not set,
the context name will be the ``object_name`` of the model that
the context name will be the ``model_name`` of the model that
the queryset is composed from, with postfix ``'_list'``
appended. For example, the model ``Article`` would have a
context object named ``article_list``.
@@ -204,4 +204,4 @@ MultipleObjectTemplateResponseMixin
Returns a list of candidate template names. Returns the following list:
* the value of ``template_name`` on the view (if provided)
* ``<app_label>/<object_name><template_name_suffix>.html``
* ``<app_label>/<model_name><template_name_suffix>.html``

View File

@@ -65,7 +65,7 @@ SingleObjectMixin
Return the context variable name that will be used to contain the
data that this view is manipulating. If :attr:`context_object_name` is
not set, the context name will be constructed from the ``object_name``
not set, the context name will be constructed from the ``model_name``
of the model that the queryset is composed from. For example, the model
``Article`` would have context object named ``'article'``.
@@ -122,4 +122,4 @@ SingleObjectTemplateResponseMixin
* the value of ``template_name`` on the view (if provided)
* the contents of the ``template_name_field`` field on the
object instance that the view is operating upon (if available)
* ``<app_label>/<object_name><template_name_suffix>.html``
* ``<app_label>/<model_name><template_name_suffix>.html``