summaryrefslogtreecommitdiff
path: root/django/contrib/admin/options.py
diff options
context:
space:
mode:
authorAdam Johnson <me@adamj.eu>2024-02-19 23:03:05 +0000
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2024-02-21 05:25:25 +0100
commit98e6f2396cd02180d772877d167008e00a683e44 (patch)
treeb372430d7f87b6cab940795b3bd62050f8d85fbd /django/contrib/admin/options.py
parenta084c5d35a6d00abd261338a374a4424764b4aee (diff)
Fixed #35237 -- Merged system checks for admin actions.
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."""