mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-18 11:00:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #28377 -- Made combining form Media retain relative asset order.

Browse source 
Thanks Florian Apolloner, Mariusz Felisiak, and Tim Graham for reviews.
This commit is contained in:
Johannes Hoppe 2017-07-20 17:06:30 +02:00 • committed by Tim Graham
parent f86b6f351d
commit c19b56f633
8 changed files with 154 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
django/contrib/admin/helpers.py
View file

@ -304,7 +304,7 @@ class InlineAdminFormSet:
@property
def media(self):
media = self.opts.media + self.formset.media
media = self.formset.media + self.opts.media
for fs in self:
media = media + fs.media
return media