From ef1259342b46cd4b63678a4acddf2a2b631d342c Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 29 Aug 2013 09:39:31 -0400 Subject: [1.6.x] Fixed #16433 -- Fixed a help_text/read only field interaction that caused an admin crash. Thanks chris at cogdon.org for the report and admackin for the patch. Backport of af953c45cc from master --- django/contrib/admin/util.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'django') diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py index b31756d762..962d8f7f1d 100644 --- a/django/contrib/admin/util.py +++ b/django/contrib/admin/util.py @@ -320,10 +320,15 @@ def label_for_field(name, model, model_admin=None, return_attr=False): def help_text_for_field(name, model): + help_text = "" try: - help_text = model._meta.get_field_by_name(name)[0].help_text + field_data = model._meta.get_field_by_name(name) except models.FieldDoesNotExist: - help_text = "" + pass + else: + field = field_data[0] + if not isinstance(field, RelatedObject): + help_text = field.help_text return smart_text(help_text) -- cgit v1.3