Fixed #1756 -- Permit selecting no file in a FilePathField with blank = True.
Thanks to Adam Endicott for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
1fc3b3229a
commit
271083cf7c
|
@ -898,10 +898,11 @@ class FilePathField(SelectField):
|
|||
"A SelectField whose choices are the files in a given directory."
|
||||
def __init__(self, field_name, path, match=None, recursive=False, is_required=False, validator_list=None):
|
||||
import os
|
||||
from django.db.models import BLANK_CHOICE_DASH
|
||||
if match is not None:
|
||||
import re
|
||||
match_re = re.compile(match)
|
||||
choices = []
|
||||
choices = not is_required and BLANK_CHOICE_DASH[:] or []
|
||||
if recursive:
|
||||
for root, dirs, files in os.walk(path):
|
||||
for f in files:
|
||||
|
|
Loading…
Reference in New Issue