Changeset 8816

Timestamp:

09/01/08 16:28:32 (3 months ago)

Author:

brosner

Message:

Fixed #7975 -- Callable defaults in inline model formsets now work correctly. Based on patch from msaelices. Thanks for your hard work msaelices.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (4 diffs)
• django/trunk/django/forms/fields.py (modified) (4 diffs)
• django/trunk/django/forms/forms.py (modified) (8 diffs)
• django/trunk/django/forms/widgets.py (modified) (3 diffs)
• django/trunk/tests/modeltests/model_formsets/models.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/forms/widgets.py (modified) (2 diffs)

django/trunk/django/db/models/fields/__init__.py

@@ -232 +232 @@
-    def get_default(self):
-        "Returns the default value for this field."
-default is not NOT_PROVIDED
+has_default()
-            if callable(self.default):
-                return self.default()
@@ -307 +307 @@
-        if self.has_default():
-            defaults['initial'] = self.get_default()
-
+
+
-        if self.choices:
-            # Fields with choices get special treatment. 
@@ -315 +316 @@
-            if self.null:
-                defaults['empty_value'] = None
-            
-            form_class = forms.TypedChoiceField
-            
-            # Many of the subclass-specific formfield arguments (min_value,
-            # max_value) don't apply for choice fields, so be sure to only pass
@@ -326 +325 @@
-                             'error_messages'):
-                    del kwargs[k]
-        
-        defaults.update(kwargs)
-        return form_class(**defaults)

django/trunk/django/forms/fields.py

@@ -29 +29 @@
-
-from util import ErrorList, ValidationError
-
+, SplitHiddenDateTimeWidget
-from django.core.files.uploadedfile import SimpleUploadedFile as UploadedFile
-
@@ -60 +60 @@
-
-    def __init__(self, required=True, widget=None, label=None, initial=None,
-
+, show_hidden_initial=False
-        # required -- Boolean that specifies whether the field is required.
-        #             True by default.
@@ -74 +74 @@
-        #            is *not* used as a fallback if data isn't given.
-        # help_text -- An optional string to use as "help text" for this Field.
+        # show_hidden_initial -- Boolean that specifies if it is needed to render a
+        #                        hidden widget with initial value after widget.
-        if label is not None:
-            label = smart_unicode(label)
-        self.required, self.label, self.initial = required, label, initial
+        self.show_hidden_initial = show_hidden_initial
-        if help_text is None:
-            self.help_text = u''
@@ -841 +844 @@
-
-class SplitDateTimeField(MultiValueField):
+    hidden_widget = SplitHiddenDateTimeWidget
-    default_error_messages = {
-        'invalid_date': _(u'Enter a valid date.'),

django/trunk/django/forms/forms.py

@@ -128 +128 @@
-        """
-        return self.prefix and ('%s-%s' % (self.prefix, field_name)) or field_name
+
+    def add_initial_prefix(self, field_name):
+        """
+        Add a 'initial' prefix for checking dynamic initial values
+        """
+        return u'initial-%s' % self.add_prefix(field_name)
-
-    def _html_output(self, normal_row, error_row, row_ender, help_text_html, errors_on_separate_row):
@@ -246 +252 @@
-        """
-        return bool(self.changed_data)
-
+
-    def _get_changed_data(self):
-        if self._changed_data is None:
@@ -259 +265 @@
-                prefixed_name = self.add_prefix(name)
-                data_value = field.widget.value_from_datadict(self.data, self.files, prefixed_name)
-
+
+
+
+
+
+
+
-                if field.widget._has_changed(initial_value, data_value):
-                    self._changed_data.append(name)
@@ -301 +313 @@
-        self.name = name
-        self.html_name = form.add_prefix(name)
+        self.html_initial_name = form.add_initial_prefix(name)
-        if self.field.label is None:
-            self.label = pretty_name(name)
@@ -309 +322 @@
-    def __unicode__(self):
-        """Renders this field as an HTML widget."""
+        if self.field.show_hidden_initial:
+            return self.as_widget() + self.as_hidden(only_initial=True)
-        return self.as_widget()
-
@@ -319 +334 @@
-    errors = property(_errors)
-
-
+, only_initial=False
-        """
-        Renders the field by rendering the passed widget, adding any HTML
@@ -331 +346 @@
-        if auto_id and 'id' not in attrs and 'id' not in widget.attrs:
-            attrs['id'] = auto_id
-
+ or only_initial
-            data = self.form.initial.get(self.name, self.field.initial)
-            if callable(data):
@@ -337 +352 @@
-        else:
-            data = self.data
-
-
-
+
+
+
+
+
+
+
-        """
-        Returns a string of HTML for representing this as an <input type="text">.
-        """
-
-
-
+, **kwargs
+
+, **kwargs
-        "Returns a string of HTML for representing this as a <textarea>."
-
-
-
+, **kwargs
+
+, **kwargs
-        """
-        Returns a string of HTML for representing this as an <input type="hidden">.
-        """
-
+, **kwargs
-
-    def _data(self):

django/trunk/django/forms/widgets.py

@@ -26 +26 @@
-    'FileInput', 'DateTimeInput', 'TimeInput', 'Textarea', 'CheckboxInput',
-    'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect',
-
+
+
-)
-
@@ -618 +619 @@
-            initial = [u'' for x in range(0, len(data))]
-        else:
-
+
+
-        for widget, initial, data in zip(self.widgets, initial, data):
-            if widget._has_changed(initial, data):
@@ -663 +665 @@
-        return [None, None]
-
+class SplitHiddenDateTimeWidget(SplitDateTimeWidget):
+    """
+    A Widget that splits datetime input into two <input type="hidden"> inputs.
+    """
+    def __init__(self, attrs=None):
+        widgets = (HiddenInput(attrs=attrs), HiddenInput(attrs=attrs))
+        super(SplitDateTimeWidget, self).__init__(widgets, attrs)
+        

django/trunk/tests/modeltests/model_formsets/models.py

@@ +1 @@
+
+import datetime
+
+from django import forms
-from django.db import models
-
@@ -93 +97 @@
-    serves_tacos = models.BooleanField()
-
+# models for testing callable defaults (see bug #7975). If you define a model
+# with a callable default value, you cannot rely on the initial value in a
+# form.
+class Person(models.Model):
+    name = models.CharField(max_length=128)
+
+class Membership(models.Model):
+    person = models.ForeignKey(Person)
+    date_joined = models.DateTimeField(default=datetime.datetime.now)
+    karma = models.IntegerField()
-
-__test__ = {'API_TESTS': """
@@ -622 +636 @@
-[{'__all__': [u'Price with this Price and Quantity already exists.']}]
-
+# Use of callable defaults (see bug #7975).
+
+>>> person = Person.objects.create(name='Ringo')
+>>> FormSet = inlineformset_factory(Person, Membership, can_delete=False, extra=1)
+>>> formset = FormSet(instance=person)
+
+# Django will render a hidden field for model fields that have a callable
+# default. This is required to ensure the value is tested for change correctly
+# 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
+>>> 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="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-id" id="id_membership_set-0-id" /></p>
+
+# test for validation with callable defaults. Validations rely on hidden fields
+
+>>> data = {
+...     'membership_set-TOTAL_FORMS': '1',
+...     'membership_set-INITIAL_FORMS': '0',
+...     'membership_set-0-date_joined': unicode(now.strftime('%Y-%m-%d %H:%M:%S')),
+...     'initial-membership_set-0-date_joined': unicode(now.strftime('%Y-%m-%d %H:%M:%S')),
+...     'membership_set-0-karma': '',
+... }
+>>> formset = FormSet(data, instance=person)
+>>> formset.is_valid()
+True
+
+# now test for when the data changes
+
+>>> one_day_later = now + datetime.timedelta(days=1)
+>>> filled_data = {
+...     'membership_set-TOTAL_FORMS': '1',
+...     'membership_set-INITIAL_FORMS': '0',
+...     'membership_set-0-date_joined': unicode(one_day_later.strftime('%Y-%m-%d %H:%M:%S')),
+...     'initial-membership_set-0-date_joined': unicode(now.strftime('%Y-%m-%d %H:%M:%S')),
+...     'membership_set-0-karma': '',
+... }
+>>> formset = FormSet(filled_data, instance=person)
+>>> formset.is_valid()
+False
+
+# now test with split datetime fields
+
+>>> class MembershipForm(forms.ModelForm):
+...     date_joined = forms.SplitDateTimeField(initial=now)
+...     class Meta:
+...         model = Membership
+...     def __init__(self, **kwargs):
+...         super(MembershipForm, self).__init__(**kwargs)
+...         self.fields['date_joined'].widget = forms.SplitDateTimeWidget()
+
+>>> FormSet = inlineformset_factory(Person, Membership, form=MembershipForm, can_delete=False, extra=1)
+>>> data = {
+...     'membership_set-TOTAL_FORMS': '1',
+...     'membership_set-INITIAL_FORMS': '0',
+...     'membership_set-0-date_joined_0': unicode(now.strftime('%Y-%m-%d')),
+...     'membership_set-0-date_joined_1': unicode(now.strftime('%H:%M:%S')),
+...     'initial-membership_set-0-date_joined': unicode(now.strftime('%Y-%m-%d %H:%M:%S')),
+...     'membership_set-0-karma': '',
+... }
+>>> formset = FormSet(data, instance=person)
+>>> formset.is_valid()
+True
+
+
-"""}

django/trunk/tests/regressiontests/forms/widgets.py

@@ -1094 +1094 @@
-u'<input type="text" name="date" value="2007-09-17 12:51:00" />'
-
-
+####
-
->>> w = TimeInput()
@@ -1114 +1114 @@
->>> w.render('time', u'13:12:11')
-u'<input type="text" name="time" value="13:12:11" />'
+
+# SplitHiddenDateTimeWidget ###################################################
+
+>>> from django.forms.widgets import SplitHiddenDateTimeWidget
+
+>>> w = SplitHiddenDateTimeWidget()
+>>> w.render('date', '')
+u'<input type="hidden" name="date_0" /><input type="hidden" name="date_1" />'
+>>> w.render('date', d)
+u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" name="date_1" value="12:51:34" />'
+>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51, 34))
+u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" name="date_1" value="12:51:34" />'
+>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51))
+u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" name="date_1" value="12:51:00" />'
+
-"""
-