Ticket #11940: modelform-callable-default.patch

django/db/models/fields/__init__.py

@@ -313 +313 @@
         "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)

django/forms/fields.py

@@ -107 +107 @@
         messages.update(error_messages or {})
         self.error_messages = messages
 
+    def _get_initial(self):
+        if callable(self._initial):
+            return self._initial()
+        return self._initial
+
+    def _set_initial(self, value):
+        self._initial = value
+
+    initial = property(_get_initial, _set_initial)
+
     def clean(self, value):
         """
         Validates the given value and returns its "cleaned" value as an

tests/regressiontests/forms/models.py

@@ -15 +15 @@
 class BoundaryModel(models.Model):
     positive_integer = models.PositiveIntegerField(null=True, blank=True)
 
+callable_default_value = 1
+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 +92 @@
 datetime.date(1980, 1, 1)
 >>> DefaultsForm().fields['value'].initial
 42
+>>> DefaultsForm().fields['callable_default'].initial != DefaultsForm().fields['callable_default'].initial
+True
 
 In a ModelForm that is passed an instance, the initial values come from the
 instance's values, not the model's defaults.
@@ -102 +111 @@
 ...     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