Fixed #21551 -- Reenabled loading fixtures from subdirectory

This was a regression in Django 1.6 that was only partially
restored in 839940f27f.
Thanks Jonas Haag for the report.
This commit is contained in:
Claude Paroz 2013-12-05 22:55:33 +01:00
parent 8a9c8bb907
commit 41ebc4838d
4 changed files with 26 additions and 9 deletions

View file

@ -28,7 +28,8 @@ Bug fixes
* Fixed ``django.contrib.humanize`` translations where the unicode sequence
for the non-breaking space was returned verbatim (#21415).
* Fixed :djadmin:`loaddata` error when fixture file name contained any dots
non related to file extensions (#21457).
non related to file extensions (#21457) or when fixture path was relative
but located in a subdirectory (#21551).
* Fixed display of inline instances in formsets when parent has 0 for primary
key (#21472).
* Fixed a regression where custom querysets for foreign keys were overwritten