Author: lukeplant
Date: 2010-03-08 09:13:08 -0600 (Mon, 08 Mar 2010)
New Revision: 12722
Modified:
django/branches/releases/1.1.X/
django/branches/releases/1.1.X/django/db/models/fields/__init__.py
django/branches/releases/1.1.X/tests/modeltests/model_formsets/models.py
django/branches/releases/1.1.X/tests/regressiontests/forms/models.py
Log:
[1.1.X] Fixed #11940 - ModelForm evaluates callable default values on form
class creation
Thanks to Harm Geerts for the report and initial patch.
Backport of [12721] from trunk
Property changes on: django/branches/releases/1.1.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12447-12448,12457,12461-12464,12467,12471,12473,12475,12484,12489-12490,12492,12497-12498,12502,12505,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12579,12581,12584,12598-12599,12602,12605,12614,12616,12621-12622,12627,12630-12631,12635,12637,12639,12641,12644,12646,12648,12650,12652,12654,12657,12659,12661,12663,12665,12667,12669,12671,12673,12676,12679,12681,12683,12686,12688,12694,12696,12698,12700,12704-12705,12719
+
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12447-12448,12457,12461-12464,12467,12471,12473,12475,12484,12489-12490,12492,12497-12498,12502,12505,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12579,12581,12584,12598-12599,12602,12605,12614,12616,12621-12622,12627,12630-12631,12635,12637,12639,12641,12644,12646,12648,12650,12652,12654,12657,12659,12661,12663,12665,12667,12669,12671,12673,12676,12679,12681,12683,12686,12688,12694,12696,12698,12700,12704-12705,12719,12721
Modified: django/branches/releases/1.1.X/django/db/models/fields/__init__.py
===================================================================
--- django/branches/releases/1.1.X/django/db/models/fields/__init__.py
2010-03-08 15:03:30 UTC (rev 12721)
+++ django/branches/releases/1.1.X/django/db/models/fields/__init__.py
2010-03-08 15:13:08 UTC (rev 12722)
@@ -322,9 +322,11 @@
"Returns a django.forms.Field instance for this database Field."
defaults = {'required': not self.blank, 'label':
capfirst(self.verbose_name), 'help_text': self.help_text}
if self.has_default():
- defaults['initial'] = self.get_default()
if callable(self.default):
+ defaults['initial'] = self.default
defaults['show_hidden_initial'] = True
+ else:
+ defaults['initial'] = self.get_default()
if self.choices:
# Fields with choices get special treatment.
include_blank = self.blank or not (self.has_default() or 'initial'
in kwargs)
Modified:
django/branches/releases/1.1.X/tests/modeltests/model_formsets/models.py
===================================================================
--- django/branches/releases/1.1.X/tests/modeltests/model_formsets/models.py
2010-03-08 15:03:30 UTC (rev 12721)
+++ django/branches/releases/1.1.X/tests/modeltests/model_formsets/models.py
2010-03-08 15:13:08 UTC (rev 12722)
@@ -930,7 +930,7 @@
# when determine what extra forms have changed to save.
>>> form = formset.forms[0] # this formset only has one form
->>> now = form.fields['date_joined'].initial
+>>> now = form.fields['date_joined'].initial()
>>> print form.as_p()
<p><label for="id_membership_set-0-date_joined">Date joined:</label> <input
type="text" name="membership_set-0-date_joined" value="..."
id="id_membership_set-0-date_joined" /><input type="hidden"
name="initial-membership_set-0-date_joined" value="..."
id="initial-membership_set-0-id_membership_set-0-date_joined" /></p>
<p><label for="id_membership_set-0-karma">Karma:</label> <input type="text"
name="membership_set-0-karma" id="id_membership_set-0-karma" /><input
type="hidden" name="membership_set-0-person" value="1"
id="id_membership_set-0-person" /><input type="hidden"
name="membership_set-0-id" id="id_membership_set-0-id" /></p>
Modified: django/branches/releases/1.1.X/tests/regressiontests/forms/models.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/forms/models.py
2010-03-08 15:03:30 UTC (rev 12721)
+++ django/branches/releases/1.1.X/tests/regressiontests/forms/models.py
2010-03-08 15:13:08 UTC (rev 12722)
@@ -15,10 +15,17 @@
class BoundaryModel(models.Model):
positive_integer = models.PositiveIntegerField(null=True, blank=True)
+callable_default_value = 0
+def callable_default():
+ global callable_default_value
+ callable_default_value = callable_default_value + 1
+ return callable_default_value
+
class Defaults(models.Model):
name = models.CharField(max_length=255, default='class default value')
def_date = models.DateField(default = datetime.date(1980, 1, 1))
value = models.IntegerField(default=42)
+ callable_default = models.IntegerField(default=callable_default)
class ChoiceModel(models.Model):
"""For ModelChoiceField and ModelMultipleChoiceField tests."""
@@ -85,6 +92,10 @@
datetime.date(1980, 1, 1)
>>> DefaultsForm().fields['value'].initial
42
+>>> r1 = DefaultsForm()['callable_default'].as_widget()
+>>> r2 = DefaultsForm()['callable_default'].as_widget()
+>>> r1 == r2
+False
In a ModelForm that is passed an instance, the initial values come from the
instance's values, not the model's defaults.
@@ -102,7 +113,7 @@
... name = CharField(max_length=255)
... class Meta:
... model = Defaults
-... exclude = ['name']
+... exclude = ['name', 'callable_default']
>>> f = ExcludingForm({'name': u'Hello', 'value': 99, 'def_date':
>>> datetime.date(1999, 3, 2)})
>>> f.is_valid()
True
--
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.
