diff options
| author | Brian Rosner <brosner@gmail.com> | 2008-08-15 17:36:33 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2008-08-15 17:36:33 +0000 |
| commit | f586c0b039170f0351832d8c57cce3bf7f4772fb (patch) | |
| tree | 5a43d8f1c0c9388bf838a9ac76107e64b7357976 | |
| parent | 415bf3efb3bac1f14efc77d5bdea7a4fddef03de (diff) | |
Fixed media creation in the add_view. It was not pulling media from the correct place.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/options.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index b72eed6210..2e6bcfcfcd 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -583,14 +583,13 @@ class ModelAdmin(BaseModelAdmin): adminForm = AdminForm(form, list(self.get_fieldsets(request)), self.prepopulated_fields) media = self.media + adminForm.media - for formset in formsets: - media = media + formset.media inline_admin_formsets = [] for inline, formset in zip(self.inline_instances, formsets): fieldsets = list(inline.get_fieldsets(request)) inline_admin_formset = InlineAdminFormSet(inline, formset, fieldsets) inline_admin_formsets.append(inline_admin_formset) + media = media + inline_admin_formset.media context = { 'title': _('Add %s') % force_unicode(opts.verbose_name), |