Commit 79cc1fa5 authored by Marcin Sokół's avatar Marcin Sokół Committed by Baptiste Mispelon
Browse files

[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 b8874084 from master.
parent a36513c2

django/views/generic/detail.py

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ class SingleObjectTemplateResponseMixin(TemplateResponseMixin): 
        * 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``

        """

        try:

            names = super(SingleObjectTemplateResponseMixin, self).get_template_names()

docs/ref/class-based-views/mixins-multiple-object.txt

+2 −2
Original line number Diff line number Diff line
@@ -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``

docs/ref/class-based-views/mixins-single-object.txt

+2 −2
Original line number Diff line number Diff line
@@ -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``

docs/topics/class-based-views/mixins.txt

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ overriding 
:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names()`

as discussed above. It actually provides a fairly sophisticated set of options,

but the main one that most people are going to use is

``<app_label>/<object_name>_detail.html``. The ``_detail`` part can be changed

``<app_label>/<model_name>_detail.html``. The ``_detail`` part can be changed

by setting

:attr:`~django.views.generic.detail.SingleObjectTemplateResponseMixin.template_name_suffix`

on a subclass to something else. (For instance, the :doc:`generic edit
@@ -165,7 +165,7 @@ as with :class:`~django.views.generic.detail.SingleObjectTemplateResponseMixin` 
above, this overrides ``get_template_names()`` to provide :meth:`a range of

options <django.views.generic.list.MultipleObjectTemplateResponseMixin>`,

with the most commonly-used being

``<app_label>/<object_name>_list.html``, with the ``_list`` part again

``<app_label>/<model_name>_list.html``, with the ``_list`` part again

being taken from the

:attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`

attribute. (The date based generic views use suffixes such as ``_archive``,