summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-01-01 21:37:36 +0000
committerJannis Leidel <jannis@leidel.info>2010-01-01 21:37:36 +0000
commit8465f49b63b1b85603e16671e9fbe41a28971560 (patch)
tree13c12de1a4ef2d03100992cd5e3627cc1216572f
parentdab87431935458203b5268093f0d766167633a95 (diff)
Fixed #12477 - Fields specified in ModelAdmin.readonly_fields now respect Field.verbose_name.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/util.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py
index 8b2435ef33..4a9f49cb7c 100644
--- a/django/contrib/admin/util.py
+++ b/django/contrib/admin/util.py
@@ -252,8 +252,7 @@ def lookup_field(name, obj, model_admin=None):
def label_for_field(name, model, model_admin):
try:
- model._meta.get_field_by_name(name)[0]
- return name
+ return model._meta.get_field_by_name(name)[0].verbose_name
except models.FieldDoesNotExist:
if name == "__unicode__":
return force_unicode(model._meta.verbose_name)