diff options
| author | Vasiliy Bolshakov <va.bolshakov@gmail.com> | 2017-12-01 03:19:02 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-12-01 08:45:50 -0500 |
| commit | 6ece69a7264bf45f6ddac5afafeb7de6c13df64f (patch) | |
| tree | 221155a3eda34029ba9e9591bc69af6d70e1fe2a /django | |
| parent | d31424fec1a3de9d281535c0503644a9d7b93c63 (diff) | |
[2.0.x] Fixed #28866 -- Made InlineAdminFormSet include InlineModelAdmin's Media before its formset's Media.
This provides better backwards compatibility following refs #28377.
Backport of 03974d81220ffd237754a82c77913799dd5909a4 from master
Diffstat (limited to 'django')
| -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 |