diff options
| author | Claude Paroz <claude@2xlibre.net> | 2017-11-08 01:06:32 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-11-07 19:06:32 -0500 |
| commit | 0cf00769ad11fa5ff0dff585d7f491a80f3e45ef (patch) | |
| tree | 010c7710d6cca4dc74c4e4cb8f92f8d329410140 /django | |
| parent | ac6a4eb9f95138628a7eec76bee91eb067af80a9 (diff) | |
Fixed #28585 -- Calculated admin's change form multipart context variable from forms and formsets
Thanks Tim Graham for the review.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 6e4ad180ac..545c8a53cd 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1061,7 +1061,10 @@ class ModelAdmin(BaseModelAdmin): 'has_add_permission': self.has_add_permission(request), 'has_change_permission': self.has_change_permission(request, obj), 'has_delete_permission': self.has_delete_permission(request, obj), - 'has_file_field': True, # FIXME - this should check if form or formsets have a FileField, + 'has_file_field': context['adminform'].form.is_multipart() or any( + admin_formset.formset.form().is_multipart() + for admin_formset in context['inline_admin_formsets'] + ), 'has_absolute_url': view_on_site_url is not None, 'absolute_url': view_on_site_url, 'form_url': form_url, |