Ticket #15651: filepath_sort.diff

django/db/models/fields/__init__.py

@@ -817 +817 @@
 class FilePathField(Field):
     description = _("File path")
 
-    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, sort=False, **kwargs):
+        self.path, self.match, self.recursive, self.sort = path, match, recursive, sort
         kwargs['max_length'] = kwargs.get('max_length', 100)
         Field.__init__(self, verbose_name, name, **kwargs)
 

django/forms/fields.py

@@ -880 +880 @@
 class FilePathField(ChoiceField):
     def __init__(self, path, match=None, recursive=False, required=True,
                  widget=None, label=None, initial=None, help_text=None,
-                 *args, **kwargs):
+                 sort=False, *args, **kwargs):
         self.path, self.match, self.recursive = path, match, recursive
         super(FilePathField, self).__init__(choices=(), required=required,
             widget=widget, label=label, initial=initial, help_text=help_text,
@@ -909 +909 @@
             except OSError:
                 pass
 
+        if sort:
+            if callable(sort):
+                self.choices = sort(self, self.choices)
+            else:
+                self.choices.sort(key=lambda x: x[1])
+
         self.widget.choices = self.choices
 
 class SplitDateTimeField(MultiValueField):