diff options
| author | Vasiliy Bolshakov <va.bolshakov@gmail.com> | 2017-12-01 03:19:02 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-11-30 20:15:28 -0500 |
| commit | 03974d81220ffd237754a82c77913799dd5909a4 (patch) | |
| tree | b04b71aee89fd4d8f3620248adaa5209dcaf7328 /django/contrib/admin/helpers.py | |
| parent | e50add6ca1605dcc06c8c5a5770342779a4d5124 (diff) | |
Fixed #28866 -- Made InlineAdminFormSet include InlineModelAdmin's Media before its formset's Media.
This provides better backwards compatibility following refs #28377.
Diffstat (limited to 'django/contrib/admin/helpers.py')
| -rw-r--r-- | django/contrib/admin/helpers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index 2b47ed07fa..58e92c9689 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -304,7 +304,7 @@ class InlineAdminFormSet: @property def media(self): - media = self.formset.media + self.opts.media + media = self.opts.media + self.formset.media for fs in self: media = media + fs.media return media |