p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Thanks to trac user nikunj.sg for the report.
This commit is contained in:
Marcin Sokół 2014-02-22 17:54:32 +01:00 committed by Baptiste Mispelon
parent 7e1376c2b0
commit b887408486
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/views/generic/detail.py
View File

@ -128,7 +128,7 @@ class SingleObjectTemplateResponseMixin(TemplateResponseMixin):
* the value of ``template_name`` on the view (if provided) * the value of ``template_name`` on the view (if provided)
* the contents of the ``template_name_field`` field on the * the contents of the ``template_name_field`` field on the
object instance that the view is operating upon (if available) 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: try:
names = super(SingleObjectTemplateResponseMixin, self).get_template_names() names = super(SingleObjectTemplateResponseMixin, self).get_template_names()

4
docs/ref/class-based-views/mixins-multiple-object.txt
View File

@ -154,7 +154,7 @@ MultipleObjectMixin
the list of data that this view is manipulating. If the list of data that this view is manipulating. If
``object_list`` is a queryset of Django objects and ``object_list`` is a queryset of Django objects and
:attr:`context_object_name` is not set, :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'`` the queryset is composed from, with postfix ``'_list'``
appended. For example, the model ``Article`` would have a appended. For example, the model ``Article`` would have a
context object named ``article_list``. context object named ``article_list``.
@ -210,4 +210,4 @@ MultipleObjectTemplateResponseMixin
Returns a list of candidate template names. Returns the following list: Returns a list of candidate template names. Returns the following list:
* the value of ``template_name`` on the view (if provided) * 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``

4
docs/ref/class-based-views/mixins-single-object.txt
View File

@ -73,7 +73,7 @@ SingleObjectMixin
Return the context variable name that will be used to contain the Return the context variable name that will be used to contain the
data that this view is manipulating. If :attr:`context_object_name` is 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 of the model that the queryset is composed from. For example, the model
``Article`` would have context object named ``'article'``. ``Article`` would have context object named ``'article'``.
@ -130,4 +130,4 @@ SingleObjectTemplateResponseMixin
* the value of ``template_name`` on the view (if provided) * the value of ``template_name`` on the view (if provided)
* the contents of the ``template_name_field`` field on the * the contents of the ``template_name_field`` field on the
object instance that the view is operating upon (if available) 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``

4
docs/topics/class-based-views/mixins.txt
View File

@ -117,7 +117,7 @@ overriding
:meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names()` :meth:`~django.views.generic.base.TemplateResponseMixin.get_template_names()`
as discussed above. It actually provides a fairly sophisticated set of options, as discussed above. It actually provides a fairly sophisticated set of options,
but the main one that most people are going to use is 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 by setting
:attr:`~django.views.generic.detail.SingleObjectTemplateResponseMixin.template_name_suffix` :attr:`~django.views.generic.detail.SingleObjectTemplateResponseMixin.template_name_suffix`
on a subclass to something else. (For instance, the :doc:`generic edit 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 above, this overrides ``get_template_names()`` to provide :meth:`a range of
options <django.views.generic.list.MultipleObjectTemplateResponseMixin>`, options <django.views.generic.list.MultipleObjectTemplateResponseMixin>`,
with the most commonly-used being 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 being taken from the
:attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix` :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`
attribute. (The date based generic views use suffixes such as ``_archive``, attribute. (The date based generic views use suffixes such as ``_archive``,