Permalink
Browse files

Fixed #22113 -- changed object_name to model_name in CBV docs.

Thanks to trac user nikunj.sg for the report.
  • Loading branch information...
kobuz authored and bmispelon committed Feb 22, 2014
1 parent 7e1376c commit b8874084868080baff29ac3453d20a845fd1568c
@@ -128,7 +128,7 @@ def get_template_names(self):
* 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()
@@ -154,7 +154,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``.
@@ -210,4 +210,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``
@@ -73,7 +73,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'``.
@@ -130,4 +130,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``
@@ -117,7 +117,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
@@ -163,7 +163,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``,

0 comments on commit b887408

Please sign in to comment.