Commit 837a2e27 authored Feb 02, 2011 by Alex Gaynor

[1.2.X] Fixed #15212 -- ensure that ModelAdmin.get_actions still returns a...

[1.2.X] Fixed #15212 -- ensure that ModelAdmin.get_actions still returns a SortedDict if there are no actions. Backport of [15393].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15394 bcc190cf-cafb-0310-a4f2-bffc1f526a37

parent e26de119

django/contrib/admin/options.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -536,7 +536,7 @@ class ModelAdmin(BaseModelAdmin):
		# If self.actions is explicitally set to None that means that we don't
		# want any actions enabled on this page.
		if self.actions is None:
		return []
		return SortedDict()

		actions = []