Ticket #2598: FilePathFieldEnhancement.diff

db/models/fields/__init__.py

@@ -613 +613 @@
         return os.path.normpath(f)
 
 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, web_path=None, **kwargs):
+        if not web_path:
+            web_path = path
+        self.path, self.match, self.recursive, self.web_path= path, match, recursive, web_path
         Field.__init__(self, verbose_name, name, **kwargs)
 
     def get_manipulator_field_objs(self):
-        return [curry(forms.FilePathField, path=self.path, match=self.match, recursive=self.recursive)]
+        return [curry(forms.FilePathField, path=self.path, match=self.match, recursive=self.recursive, web_path=self.web_path)]
 
 class FloatField(Field):
     empty_strings_allowed = False

forms/__init__.py

@@ -901 +901 @@
 
 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):
+    def __init__(self, field_name, path, match=None, recursive=False, web_path=None, is_required=False, validator_list=None):
         import os
         from django.db.models import BLANK_CHOICE_DASH
+        path, web_path = os.path.normpath(path), os.path.normpath(web_path)
         if match is not None:
             import re
             match_re = re.compile(match)
         choices = not is_required and BLANK_CHOICE_DASH[:] or []
         if recursive:
+            ignore_length = len(path)+1
             for root, dirs, files in os.walk(path):
                 for f in files:
                     if match is None or match_re.search(f):
-                        choices.append((os.path.join(root, f), f))
+                        choices.append((os.path.join(web_path, root[ignore_length:], f), f))
         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))
+                        choices.append((os.path.join(web_path, f), f))
             except OSError:
                 pass
         SelectField.__init__(self, field_name, choices, 1, is_required, validator_list)