From b8874084868080baff29ac3453d20a845fd1568c Mon Sep 17 00:00:00 2001 From: Marcin Sokół Date: Sat, 22 Feb 2014 17:54:32 +0100 Subject: Fixed #22113 -- changed object_name to model_name in CBV docs. Thanks to trac user nikunj.sg for the report. --- docs/ref/class-based-views/mixins-multiple-object.txt | 4 ++-- docs/ref/class-based-views/mixins-single-object.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/ref/class-based-views') 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`` -- cgit v1.3