p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #29689 -- Moved FilePathField choices sorting outside the loop.

This commit is contained in:
Sergey Fedoseev 2018-08-29 15:19:32 +05:00 committed by Tim Graham
parent 39461a83c3
commit 54b331451c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/forms/fields.py
View File

@ -1113,7 +1113,7 @@ class FilePathField(ChoiceField):
(self.allow_folders and f.is_dir())) and (self.allow_folders and f.is_dir())) and
(self.match is None or self.match_re.search(f.name))): (self.match is None or self.match_re.search(f.name))):
choices.append((f.path, f.name)) choices.append((f.path, f.name))
choices.sort(key=operator.itemgetter(1)) choices.sort(key=operator.itemgetter(1))
self.choices.extend(choices) self.choices.extend(choices)
self.widget.choices = self.choices self.widget.choices = self.choices