diff options
| -rw-r--r-- | django/views/generic/detail.py | 2 | ||||
| -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 | ||||
| -rw-r--r-- | 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 ec9a9b7d0e..180da301b4 100644 --- a/django/views/generic/detail.py +++ b/django/views/generic/detail.py @@ -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() 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`` diff --git a/docs/topics/class-based-views/mixins.txt b/docs/topics/class-based-views/mixins.txt index 2132b4ffa3..7354773121 100644 --- a/docs/topics/class-based-views/mixins.txt +++ b/docs/topics/class-based-views/mixins.txt @@ -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``, |