Changeset 7506

Timestamp:

04/28/08 23:31:59 (2 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #6964 -- Implemented FileInput?._has_changed. Before it was comparing the wrong values and causing it to trip up.

Files:

• django/branches/newforms-admin/django/newforms/widgets.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/forms/widgets.py (modified) (1 diff)

django/branches/newforms-admin/django/newforms/widgets.py

@@ -263 +263 @@
-        "File widgets take data from FILES, not POST"
-        return files.get(name, None)
+    
+    def _has_changed(self, initial, data):
+        if data is None:
+            return False
+        return True
-
-class Textarea(Widget):

django/branches/newforms-admin/tests/regressiontests/forms/widgets.py

@@ -202 +202 @@
->>> w.render('email', 'ŠĐĆŜćşšđ', attrs={'class': 'fun'})
-u'<input type="file" class="fun" name="email" />'
+
+Test for the behavior of _has_changed for FileInput. The value of data will
+more than likely come from request.FILES. The value of initial data will
+likely be a filename stored in the database. Since its value is of no use to
+a FileInput it is ignored.
+
+>>> w = FileInput()
+
+# No file was uploaded and no initial data.
+>>> w._has_changed(u'', None)
+False
+
+# A file was uploaded and no initial data.
+>>> w._has_changed(u'', {'filename': 'resume.txt', 'content': 'My resume'})
+True
+
+# A file was not uploaded, but there is initial data
+>>> w._has_changed(u'resume.txt', None)
+False
+
+# A file was uploaded and there is initial data (file identity is not dealt
+# with here)
+>>> w._has_changed('resume.txt', {'filename': 'resume.txt', 'content': 'My resume'})
+True
-
-# Textarea Widget #############################################################