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
2011-02-02 15:24:31 +00:00 · 2011-02-02 15:24:31 +00:00 · 05e3bf4bef
parent dc5f2607de
commit 05e3bf4bef
1 changed files with 1 additions and 1 deletions
--- 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 = []