Changeset 8057

Timestamp:

07/22/08 22:25:41 (6 months ago)

Author:

brosner

Message:

Fixed #7898 -- Moved formset media definition to a media property in InlineAdminFormSet? display helper and added InlineAdminForm? media at the same time. This now properly renders all media associated with the formset and its display helper children. Thanks dima.kozlov for the report.

Files:

• django/trunk/django/contrib/admin/options.py (modified) (3 diffs)

django/trunk/django/contrib/admin/options.py

@@ -557 +557 @@
-        adminForm = AdminForm(form, self.get_fieldsets(request, obj), self.prepopulated_fields)
-        media = self.media + adminForm.media
-        for fs in inline_formsets:
-            media = media + fs.media
-
-        inline_admin_formsets = []
@@ -565 +563 @@
-            inline_admin_formset = InlineAdminFormSet(inline, formset, fieldsets)
-            inline_admin_formsets.append(inline_admin_formset)
+            media = media + inline_admin_formset.media
-
-        context = {
@@ -760 +759 @@
-        for field_name in flatten_fieldsets(self.fieldsets):
-            yield self.formset.form.base_fields[field_name]
+    
+    def _media(self):
+        media = self.formset.media
+        for fs in self:
+            media = media + fs.media
+        return media
+    media = property(_media)
-
-class InlineAdminForm(AdminForm):