Fixed #2923: FileFields can now be modified on windows. Thanks, radek.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
4d59730fad
commit
a4d86a7fb0
|
@ -585,7 +585,7 @@ class FileField(Field):
|
||||||
# If the raw path is passed in, validate it's under the MEDIA_ROOT.
|
# If the raw path is passed in, validate it's under the MEDIA_ROOT.
|
||||||
def isWithinMediaRoot(field_data, all_data):
|
def isWithinMediaRoot(field_data, all_data):
|
||||||
f = os.path.abspath(os.path.join(settings.MEDIA_ROOT, field_data))
|
f = os.path.abspath(os.path.join(settings.MEDIA_ROOT, field_data))
|
||||||
if not f.startswith(os.path.normpath(settings.MEDIA_ROOT)):
|
if not f.startswith(os.path.abspath(os.path.normpath(settings.MEDIA_ROOT))):
|
||||||
raise validators.ValidationError, _("Enter a valid filename.")
|
raise validators.ValidationError, _("Enter a valid filename.")
|
||||||
field_list[1].validator_list.append(isWithinMediaRoot)
|
field_list[1].validator_list.append(isWithinMediaRoot)
|
||||||
return field_list
|
return field_list
|
||||||
|
|
Loading…
Reference in New Issue