mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-26 12:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[1.6.x] Fixed #20224 -- Update docs examples which mention __unicode__

Browse source 
Thanks Marc Tamlyn and Tim Graham for the review.
Backport of 7442eb1a24 from master.
This commit is contained in:
Claude Paroz 2013-07-04 15:19:33 +02:00
parent 430aae1b0d
commit a9dd6221af
24 changed files with 65 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/ref/contrib/admin/actions.txt
View file

@ -57,6 +57,7 @@ simple news application with an ``Article`` model::
body = models.TextField()
status = models.CharField(max_length=1, choices=STATUS_CHOICES)
# On Python 3: def __str__(self):
def __unicode__(self):
return self.title

5
docs/ref/contrib/admin/index.txt
View file

@ -438,7 +438,8 @@ subclass::
list_display = ('first_name', 'last_name')
If you don't set ``list_display``, the admin site will display a single
column that displays the ``__unicode__()`` representation of each object.
column that displays the ``__unicode__()`` (``__str__()`` on Python 3)
representation of each object.
You have four possible values that can be used in ``list_display``:
@ -488,7 +489,7 @@ subclass::
A few special cases to note about ``list_display``:
* If the field is a ``ForeignKey``, Django will display the
``__unicode__()`` of the related object.
``__unicode__()`` (``__str__()`` on Python 3) of the related object.
* ``ManyToManyField`` fields aren't supported, because that would
entail executing a separate SQL statement for each row in the table.