diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2011-02-02 15:24:31 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2011-02-02 15:24:31 +0000 |
| commit | 05e3bf4befc9f5876a0435f798b1b831e340bbd6 (patch) | |
| tree | f9feabcf261e0393848e947c0e832e4e66293293 | |
| parent | dc5f2607deb35022523fef17dcd8479ca812e887 (diff) | |
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
| -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 db445247d2..f7b979bc3d 100644 --- 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 = [] |