Ticket #5893: diff.2.diff

django/oldforms/__init__.py

@@ -946 +946 @@
 
 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, max_length=None):
+    def __init__(self, field_name, path, match=None, recursive=False, is_required=False, validator_list=None, max_length=None, allow_files=True, allow_folders=False):
         import os
         from django.db.models import BLANK_CHOICE_DASH
         if match is not None:
@@ -955 +955 @@
         choices = not is_required and BLANK_CHOICE_DASH[:] or []
         if recursive:
             for root, dirs, files in os.walk(path):
-                for f in files:
-                    if match is None or match_re.search(f):
-                        f = os.path.join(root, f)
-                        choices.append((f, f.replace(path, "", 1)))
+                if allow_files:
+                    for f in files:
+                        if match is None or match_re.search(f):
+                            f = os.path.join(root, f)
+                            choices.append((f, f.replace(path, "", 1)))
+                if allow_folders:
+                    for f in dirs:
+                        if match is None or match_re.search(f):
+                            f = os.path.join(root, f)
+                            choices.append((f, f.replace(path, "", 1)))
         else:
             try:
                 for f in os.listdir(path):
                     full_file = os.path.join(path, f)
-                    if os.path.isfile(full_file) and (match is None or match_re.search(f)):
-                        choices.append((full_file, f))
+                    if allow_files and allow_folders:
+                        if (os.path.isfile(full_file) or os.path.isdir(full_file)) and (match is None or match_re.search(f)):
+                            choices.append((full_file, f))
+                    elif allow_folders:
+                        if os.path.isdir(full_file) and (match is None or match_re.search(f)):
+                            choices.append((full_file, f))
+                    elif allow_files:
+                        if os.path.isfile(full_file) and (match is None or match_re.search(f)):
+                            choices.append((full_file, f))
             except OSError:
                 pass
         SelectField.__init__(self, field_name, choices, 1, is_required, validator_list)

django/db/models/fields/__init__.py

@@ -810 +810 @@
         return super(FileField, self).formfield(**defaults)
 
 class FilePathField(Field):
-    def __init__(self, verbose_name=None, name=None, path='', match=None, recursive=False, **kwargs):
-        self.path, self.match, self.recursive = path, match, recursive
+    def __init__(self, verbose_name=None, name=None, path='', match=None, recursive=False, allow_files=True, allow_folders=False, **kwargs):
+        self.path, self.match, self.recursive, self.allow_files, self.allow_folders = path, match, recursive, allow_files, allow_folders
         kwargs['max_length'] = kwargs.get('max_length', 100)
         Field.__init__(self, verbose_name, name, **kwargs)
 
     def get_manipulator_field_objs(self):
-        return [curry(oldforms.FilePathField, path=self.path, match=self.match, recursive=self.recursive)]
+        return [curry(oldforms.FilePathField, path=self.path, match=self.match, recursive=self.recursive, allow_files=self.allow_files, allow_folders=self.allow_folders)]
 
 class FloatField(Field):
     empty_strings_allowed = False