Changeset 7021

Timestamp:

01/17/08 12:03:21 (6 months ago)

Author:

jkocherhans

Message:

Fixed #6302. FileField? no longer requires a value if one already exists. Thanks Brian Rosner and Øyvind Saltvik.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (2 diffs)
• django/trunk/django/newforms/fields.py (modified) (2 diffs)
• django/trunk/django/newforms/forms.py (modified) (2 diffs)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/forms/fields.py (modified) (3 diffs)

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

@@ -798 +798 @@
-
-    def save_form_data(self, instance, data):
-
+
+
-            getattr(instance, "save_%s_file" % self.name)(data.filename, data.content, save=False)
-
@@ -805 +806 @@
-        # If a file has been provided previously, then the form doesn't require
-        # that a new file is provided this time.
+        # The code to mark the form field as not required is used by
+        # form_for_instance, but can probably be removed once form_for_instance
+        # is gone. ModelForm uses a different method to check for an existing file.
-        if 'initial' in kwargs:
-            defaults['required'] = False

django/trunk/django/newforms/fields.py

@@ -438 +438 @@
-        super(FileField, self).__init__(*args, **kwargs)
-
-
-
+, initial=None
+initial or 
-        if not self.required and data in EMPTY_VALUES:
-            return None
+        elif not data and initial:
+            return initial
-        try:
-            f = UploadedFile(data['filename'], data['content'])
@@ -457 +459 @@
-    }
-
-
+, initial=None
-        """
-        Checks that the file-upload field data contains a valid image (GIF, JPG,
-        PNG, possibly others -- whatever the Python Imaging Library supports).
-        """
-
+, initial
-        if f is None:
-            return None

django/trunk/django/newforms/forms.py

@@ -10 +10 @@
-from django.utils.safestring import mark_safe
-
-
+, FileField
-from widgets import TextInput, Textarea
-from util import flatatt, ErrorDict, ErrorList, ValidationError
@@ -183 +183 @@
-            value = field.widget.value_from_datadict(self.data, self.files, self.add_prefix(name))
-            try:
-
+
+
+
+
+
-                self.cleaned_data[name] = value
-                if hasattr(self, 'clean_%s' % name):

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

@@ -7 +7 @@
-most of these tests should be rewritten.
-"""
+
+import os
+import tempfile
-
-from django.db import models
@@ -55 +58 @@
-    def __unicode__(self):
-        return self.phone
+
+class TextFile(models.Model):
+    description = models.CharField(max_length=20)
+    file = models.FileField(upload_to=tempfile.gettempdir())
+
+    def __unicode__(self):
+        return self.description
-
-__test__ = {'API_TESTS': """
@@ -702 +712 @@
->>> f.cleaned_data
-{'phone': u'312-555-1212', 'description': u'Assistance'}
+
+# FileField ###################################################################
+
+>>> class TextFileForm(ModelForm):
+...     class Meta:
+...         model = TextFile
+
+Test conditions when files is either not given or empty.
+
+>>> f = TextFileForm(data={'description': u'Assistance'})
+>>> f.is_valid()
+False
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={})
+>>> f.is_valid()
+False
+
+Upload a file and ensure it all works as expected.
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': {'filename': 'test1.txt', 'content': 'hello world'}})
+>>> f.is_valid()
+True
+>>> type(f.cleaned_data['file'])
+<class 'django.newforms.fields.UploadedFile'>
+>>> instance = f.save()
+>>> instance.file
+u'.../test1.txt'
+
+Edit an instance that already has the file defined in the model. This will not
+save the file again, but leave it exactly as it is.
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, instance=instance)
+>>> f.is_valid()
+True
+>>> f.cleaned_data['file']
+u'.../test1.txt'
+>>> instance = f.save()
+>>> instance.file
+u'.../test1.txt'
+
+Delete the current file since this is not done by Django.
+
+>>> os.unlink(instance.get_file_filename())
+
+Override the file by uploading a new one.
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': {'filename': 'test2.txt', 'content': 'hello world'}}, instance=instance)
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.file
+u'.../test2.txt'
+
+>>> instance.delete()
+
+Test the non-required FileField
+
+>>> f = TextFileForm(data={'description': u'Assistance'})
+>>> f.fields['file'].required = False
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.file
+''
+
+>>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': {'filename': 'test3.txt', 'content': 'hello world'}}, instance=instance)
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.file
+u'.../test3.txt'
+>>> instance.delete()
-"""}

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

@@ -751 +751 @@
-ValidationError: [u'This field is required.']
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
->>> f.clean({})
@@ -761 +777 @@
-ValidationError: [u'No file was submitted.']
-
+>>> f.clean({}, '')
+Traceback (most recent call last):
+...
+ValidationError: [u'No file was submitted.']
+
+>>> f.clean({}, 'files/test3.pdf')
+'files/test3.pdf'
+
->>> f.clean('some content that is not a file')
-Traceback (most recent call last):
@@ -766 +790 @@
-ValidationError: [u'No file was submitted. Check the encoding type on the form.']
-
-
+ 
-Traceback (most recent call last):
-...
-ValidationError: [u'The submitted file is empty.']
-
-
+ 
-Traceback (most recent call last):
-...
-ValidationError: [u'The submitted file is empty.']
-
-
+
+
+
+
-<class 'django.newforms.fields.UploadedFile'>
-