summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/util.py9
1 files changed, 7 insertions, 2 deletions
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)