diff options
| author | Marcin Sokół <kobbuz@gmail.com> | 2014-02-22 17:54:32 +0100 |
|---|---|---|
| committer | Baptiste Mispelon <bmispelon@gmail.com> | 2014-02-23 13:52:45 +0100 |
| commit | 79cc1fa58df17c3d9335a07086111bad8caa2d88 (patch) | |
| tree | c0955c9cb783977aa9c7f819109d5a6584a26702 /docs/ref/class-based-views | |
| parent | a36513c2b41f50856144b8b66d5afc71e264b3cc (diff) | |
[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 b8874084868080baff29ac3453d20a845fd1568c from master.
Diffstat (limited to 'docs/ref/class-based-views')
| -rw-r--r-- | docs/ref/class-based-views/mixins-multiple-object.txt | 4 | ||||
| -rw-r--r-- | docs/ref/class-based-views/mixins-single-object.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/class-based-views/mixins-multiple-object.txt b/docs/ref/class-based-views/mixins-multiple-object.txt index b28bd11a71..6a283817f5 100644 --- a/docs/ref/class-based-views/mixins-multiple-object.txt +++ b/docs/ref/class-based-views/mixins-multiple-object.txt @@ -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`` diff --git a/docs/ref/class-based-views/mixins-single-object.txt b/docs/ref/class-based-views/mixins-single-object.txt index bbe930d79e..552cebca06 100644 --- a/docs/ref/class-based-views/mixins-single-object.txt +++ b/docs/ref/class-based-views/mixins-single-object.txt @@ -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`` |
