diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2011-02-02 15:25:57 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2011-02-02 15:25:57 +0000 |
| commit | 837a2e2773125fcda0c419597b2c19a3d05b4879 (patch) | |
| tree | 38704524ec6fdc2f3ebd8a441a7bb44a3d954883 | |
| parent | e26de119f4dad4ec8bf2f8f24c1b6dd239eab04f (diff) | |
| download | django-837a2e2773125fcda0c419597b2c19a3d05b4879.tar.gz | |
[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
| -rw-r--r-- | django/contrib/admin/options.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index a108c7e993..a80509f801 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -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 = [] |