Author: jacob
Date: 2009-04-08 13:55:06 -0500 (Wed, 08 Apr 2009)
New Revision: 10448
Modified:
django/branches/releases/1.0.X/django/forms/fields.py
django/branches/releases/1.0.X/tests/regressiontests/model_forms_regress/models.py
Log:
[1.0.X] Fixed #8422: FilePathField now respects required=False. Backport of
r10447 from trunk.
Modified: django/branches/releases/1.0.X/django/forms/fields.py
===================================================================
--- django/branches/releases/1.0.X/django/forms/fields.py 2009-04-08
18:53:55 UTC (rev 10447)
+++ django/branches/releases/1.0.X/django/forms/fields.py 2009-04-08
18:55:06 UTC (rev 10448)
@@ -828,9 +828,15 @@
super(FilePathField, self).__init__(choices=(), required=required,
widget=widget, label=label, initial=initial, help_text=help_text,
*args, **kwargs)
- self.choices = []
+
+ if self.required:
+ self.choices = []
+ else:
+ self.choices = [("", "---------")]
+
if self.match is not None:
self.match_re = re.compile(self.match)
+
if recursive:
for root, dirs, files in os.walk(self.path):
for f in files:
@@ -845,6 +851,7 @@
self.choices.append((full_file, f))
except OSError:
pass
+
self.widget.choices = self.choices
class SplitDateTimeField(MultiValueField):
Modified:
django/branches/releases/1.0.X/tests/regressiontests/model_forms_regress/models.py
===================================================================
---
django/branches/releases/1.0.X/tests/regressiontests/model_forms_regress/models.py
2009-04-08 18:53:55 UTC (rev 10447)
+++
django/branches/releases/1.0.X/tests/regressiontests/model_forms_regress/models.py
2009-04-08 18:55:06 UTC (rev 10448)
@@ -1,3 +1,4 @@
+import os
from django.db import models
from django import forms
@@ -12,6 +13,9 @@
class Meta:
unique_together = (('left', 'middle'), ('middle', 'right'))
+class FilePathModel(models.Model):
+ path = models.FilePathField(path=os.path.dirname(__file__),
match=".*\.py$", blank=True)
+
__test__ = {'API_TESTS': """
When the same field is involved in multiple unique_together constraints, we
need to make sure we don't remove the data for it before doing all the
@@ -28,5 +32,14 @@
>>> form = TripleForm({'left': '1', 'middle': '3', 'right': '1'})
>>> form.is_valid()
True
+
+# Regression test for #8842: FilePathField(blank=True)
+>>> class FPForm(forms.ModelForm):
+... class Meta:
+... model = FilePathModel
+
+>>> form = FPForm()
+>>> [c[1] for c in form['path'].field.choices]
+['---------', '__init__.py', 'models.py']
"""}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
