Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #13963 -- Use the correct verbose name of a reverse relation fi…

…eld in the admin. Thanks, sfllaw and d0ugal.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 214dc97bf39789294304013ebcd2a5f4b49547cf 1 parent 400125d
@jezdez jezdez authored
View
7 django/contrib/admin/util.py
@@ -1,4 +1,5 @@
from django.db import models
+from django.db.models.related import RelatedObject
from django.forms.forms import pretty_name
from django.utils import formats
from django.utils.html import escape
@@ -278,7 +279,11 @@ def lookup_field(name, obj, model_admin=None):
def label_for_field(name, model, model_admin=None, return_attr=False):
attr = None
try:
- label = model._meta.get_field_by_name(name)[0].verbose_name
+ field = model._meta.get_field_by_name(name)[0]
+ if isinstance(field, RelatedObject):
+ label = field.opts.verbose_name
+ else:
+ label = field.verbose_name
except models.FieldDoesNotExist:
if name == "__unicode__":
label = force_unicode(model._meta.verbose_name)
View
15 tests/regressiontests/admin_util/models.py
@@ -1,7 +1,5 @@
from django.db import models
-
-
class Article(models.Model):
"""
A simple Article model for testing
@@ -20,3 +18,16 @@ def test_from_model_with_override(self):
class Count(models.Model):
num = models.PositiveSmallIntegerField()
+
+class Event(models.Model):
+ date = models.DateTimeField(auto_now_add=True)
+
+class Location(models.Model):
+ event = models.OneToOneField(Event, verbose_name='awesome event')
+
+class Guest(models.Model):
+ event = models.OneToOneField(Event)
+ name = models.CharField(max_length=255)
+
+ class Meta:
+ verbose_name = "awesome guest"
View
19 tests/regressiontests/admin_util/tests.py
@@ -11,7 +11,7 @@
from django.utils import unittest
from django.utils.formats import localize
-from models import Article, Count
+from models import Article, Count, Event, Location
class NestedObjectsTests(TestCase):
@@ -219,3 +219,20 @@ def test_from_model(self, obj):
),
("not Really the Model", MockModelAdmin.test_from_model)
)
+
+ def test_related_name(self):
+ """
+ Regression test for #13963
+ """
+ self.assertEquals(
+ label_for_field('location', Event, return_attr=True),
+ ('location', None),
+ )
+ self.assertEquals(
+ label_for_field('event', Location, return_attr=True),
+ ('awesome event', None),
+ )
+ self.assertEquals(
+ label_for_field('guest', Event, return_attr=True),
+ ('awesome guest', None),
+ )
Please sign in to comment.
Something went wrong with that request. Please try again.