Ticket #12882: 12882.2.diff

django/contrib/admin/helpers.py

@@ -75 +75 @@
 
     def _media(self):
         if 'collapse' in self.classes:
-            return forms.Media(js=['%sjs/collapse.min.js' % settings.ADMIN_MEDIA_PREFIX])
+            js = ['js/jquery.min.js', 'js/collapse.min.js']
+            return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js])
         return forms.Media()
     media = property(_media)
 

django/contrib/admin/templates/admin/edit_inline/stacked.html

@@ -63 +63 @@
             })
         });
     });
-})(jQuery.noConflict());
+})(jQuery.noConflict(true));
 </script>

django/contrib/admin/templates/admin/edit_inline/tabular.html

@@ -109 +109 @@
             })
         });
     });
-})(jQuery.noConflict());
+})(jQuery.noConflict(true));
 </script>