From 6ece69a7264bf45f6ddac5afafeb7de6c13df64f Mon Sep 17 00:00:00 2001
From: Vasiliy Bolshakov <va.bolshakov@gmail.com>
Date: Fri, 1 Dec 2017 03:19:02 +0700
Subject: [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
---
 django/contrib/admin/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'django')

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
-- 
cgit v1.3