From 05e3bf4befc9f5876a0435f798b1b831e340bbd6 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 2 Feb 2011 15:24:31 +0000 Subject: [PATCH] Fixed #15212 -- ensure that ModelAdmin.get_actions still returns a SortedDict if there are no actions. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15393 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index db445247d2..f7b979bc3d 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -547,7 +547,7 @@ class ModelAdmin(BaseModelAdmin): # want *any* actions enabled on this page. from django.contrib.admin.views.main import IS_POPUP_VAR if self.actions is None or IS_POPUP_VAR in request.GET: - return [] + return SortedDict() actions = []