Commit 05e3bf4b authored Feb 02, 2011 by Alex Gaynor

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

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

parent dc5f2607

django/contrib/admin/options.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 = []