Fix media-combining in formsets on Django 2.2

2019-07-11 21:38:24 +02:00
parent 0f9dbe05b0
commit 622e1e780b
1 changed files with 4 additions and 3 deletions
@@ -7,10 +7,11 @@ import django
 def add_media(dest, media):
    """
    Optimized version of django.forms.Media.__add__() that doesn't create new objects.
-
-    Only required for Django < 2.0
    """
-    if django.VERSION >= (2, 0):
+    if django.VERSION >= (2, 2):
+        dest._css_lists += media._css_lists
+        dest._js_lists += media._js_lists
+    elif django.VERSION >= (2, 0):
        combined = dest + media
        dest._css = combined._css
        dest._js = combined._js