summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMykola Kokalko <jajcee@gmail.com>2019-05-02 10:42:10 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-05-02 11:11:56 +0200
commitef082ebb84f00e38af4e8880d04e8365c2766d34 (patch)
tree1b6d22c787dafd5cd06615511a724216fad221bf /django
parent11971cd87c6cb208325d28ddf7e663dadde77d68 (diff)
Fixed #29529 -- Allowed models.fields.FilePathField to accept a callable path.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 0c64748ccd..4d7eb11151 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -1709,7 +1709,7 @@ class FilePathField(Field):
def formfield(self, **kwargs):
return super().formfield(**{
- 'path': self.path,
+ 'path': self.path() if callable(self.path) else self.path,
'match': self.match,
'recursive': self.recursive,
'form_class': forms.FilePathField,