From b8874084868080baff29ac3453d20a845fd1568c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Sok=C3=B3=C5=82?= Date: Sat, 22 Feb 2014 17:54:32 +0100 Subject: [PATCH] Fixed #22113 -- changed object_name to model_name in CBV docs. Thanks to trac user nikunj.sg for the report. --- django/views/generic/detail.py | 2 +- docs/ref/class-based-views/mixins-multiple-object.txt | 4 ++-- docs/ref/class-based-views/mixins-single-object.txt | 4 ++-- docs/topics/class-based-views/mixins.txt | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/django/views/generic/detail.py b/django/views/generic/detail.py index f25b416498..cbb8cf8fed 100644 --- a/django/views/generic/detail.py +++ b/django/views/generic/detail.py @@ -128,7 +128,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) - * ``/.html`` + * ``/.html`` """ try: names = super(SingleObjectTemplateResponseMixin, self).get_template_names() diff --git a/docs/ref/class-based-views/mixins-multiple-object.txt b/docs/ref/class-based-views/mixins-multiple-object.txt index 5a2ae85751..62dae9e094 100644 --- a/docs/ref/class-based-views/mixins-multiple-object.txt +++ b/docs/ref/class-based-views/mixins-multiple-object.txt @@ -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) - * ``/.html`` + * ``/.html`` diff --git a/docs/ref/class-based-views/mixins-single-object.txt b/docs/ref/class-based-views/mixins-single-object.txt index 1fce24acc5..9a67e78fad 100644 --- a/docs/ref/class-based-views/mixins-single-object.txt +++ b/docs/ref/class-based-views/mixins-single-object.txt @@ -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) - * ``/.html`` + * ``/.html`` diff --git a/docs/topics/class-based-views/mixins.txt b/docs/topics/class-based-views/mixins.txt index fb0b388b57..8e7b4561e9 100644 --- a/docs/topics/class-based-views/mixins.txt +++ b/docs/topics/class-based-views/mixins.txt @@ -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 -``/_detail.html``. The ``_detail`` part can be changed +``/_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 `, with the most commonly-used being -``/_list.html``, with the ``_list`` part again +``/_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``,