mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #30179 -- Fixed form Media merging when pairwise merging is insufficient.

Browse Source 
Thanks gasman for the tests, and codingjoe and timgraham for the review.
This commit is contained in:
Matthias Kestenholz
2019-02-23 16:41:56 +01:00
committed by Tim Graham
parent 93e892bb64
commit 231b513926
4 changed files with 108 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/admin_widgets/test_autocomplete_widget.py
View File

@@ -139,4 +139,4 @@ class AutocompleteMixinTests(TestCase):
else:
expected_files = base_files
with translation.override(lang):
self.assertEqual(AutocompleteSelect(rel, admin.site).media._js, expected_files)
self.assertEqual(AutocompleteSelect(rel, admin.site).media._js, list(expected_files))