summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2011-05-05 22:03:17 +0000
committerLuke Plant <L.Plant.98@cantab.net>2011-05-05 22:03:17 +0000
commit8eccb728ccd97a07b9281d3a7c2c6bac105f285f (patch)
tree669c578c2cbac4ac2621530660d34f9a9d98dd35 /django
parentd11acfd20959ec0d1baf93f8521e1077337b9c3b (diff)
Fixed #15964 - Do not order admin actions by description
Thanks to julien for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/options.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 787f8567e3..c603210e8b 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -576,9 +576,7 @@ class ModelAdmin(BaseModelAdmin):
# get_action might have returned None, so filter any of those out.
actions = filter(None, actions)
- # Convert the actions into a SortedDict keyed by name
- # and sorted by description.
- actions.sort(key=lambda k: k[2].lower())
+ # Convert the actions into a SortedDict keyed by name.
actions = SortedDict([
(name, (func, name, desc))
for func, name, desc in actions