summaryrefslogtreecommitdiff
path: root/tests/regressiontests/admin_views/models.py
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 /tests/regressiontests/admin_views/models.py
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 'tests/regressiontests/admin_views/models.py')
-rw-r--r--tests/regressiontests/admin_views/models.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py
index 6e34ee1272..854fb60e70 100644
--- a/tests/regressiontests/admin_views/models.py
+++ b/tests/regressiontests/admin_views/models.py
@@ -341,13 +341,15 @@ def external_mail(modeladmin, request, selected):
'from@example.com',
['to@example.com']
).send()
+external_mail.short_description = 'External mail (Another awesome action)'
def redirect_to(modeladmin, request, selected):
from django.http import HttpResponseRedirect
return HttpResponseRedirect('/some-where-else/')
+redirect_to.short_description = 'Redirect to (Awesome action)'
class ExternalSubscriberAdmin(admin.ModelAdmin):
- actions = [external_mail, redirect_to]
+ actions = [redirect_to, external_mail]
class Media(models.Model):
name = models.CharField(max_length=60)