Permalink
Browse files

Fixed #15212 -- ensure that ModelAdmin.get_actions still returns a So…

…rtedDict if there are no actions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent dc5f260 commit 05e3bf4befc9f5876a0435f798b1b831e340bbd6 @alex alex committed Feb 2, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 django/contrib/admin/options.py
View
2 django/contrib/admin/options.py
@@ -547,7 +547,7 @@ def get_actions(self, request):
# 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 = []

0 comments on commit 05e3bf4

Please sign in to comment.