summaryrefslogtreecommitdiff
path: root/django/contrib/admin/options.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/contrib/admin/options.py')
-rw-r--r--django/contrib/admin/options.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index e93fdf4047..47b4821fcc 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -1033,7 +1033,10 @@ class ModelAdmin(BaseModelAdmin):
@staticmethod
def _get_action_description(func, name):
- return getattr(func, "short_description", capfirst(name.replace("_", " ")))
+ try:
+ return func.short_description
+ except AttributeError:
+ return capfirst(name.replace("_", " "))
def _get_base_actions(self):
"""Return the list of actions, prior to any request-based filtering."""