Changeset 7515

Timestamp:

05/05/08 12:28:34 (1 week ago)

Author:

brosner

Message:

newforms-admin: Fixed #7132 -- Added a _has_changed method to SelectMultiple? along with tests. SelectMultiple? now correctly reports when it has changed or not.

Files:

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

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

@@ -402 +402 @@
-            return data.getlist(name)
-        return data.get(name, None)
+    
+    def _has_changed(self, initial, data):
+        if initial is None:
+            initial = []
+        if data is None:
+            data = []
+        if len(initial) != len(data):
+            return True
+        for value1, value2 in zip(initial, data):
+            if force_unicode(value1) != force_unicode(value2):
+                return True
+        return False
-
-class RadioInput(StrAndUnicode):

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

@@ -612 +612 @@
->>> w.render('nums', ['ŠĐĆŜćşšđ'], choices=[('ŠĐĆŜćşšđ', 'ŠĐabcĆŜćşšđ'), ('ćşšđ', 'abcćşšđ')])
-u'<select multiple="multiple" name="nums">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" selected="selected">\u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</option>\n<option value="\u0107\u017e\u0161\u0111">abc\u0107\u017e\u0161\u0111</option>\n</select>'
+
+# Test the usage of _has_changed
+>>> w._has_changed(None, None)
+False
+>>> w._has_changed([], None)
+False
+>>> w._has_changed(None, [u'1'])
+True
+>>> w._has_changed([1, 2], [u'1', u'2'])
+False
+>>> w._has_changed([1, 2], [u'1'])
+True
+>>> w._has_changed([1, 2], [u'1', u'3'])
+True
-
-# RadioSelect Widget ##########################################################
@@ -911 +925 @@
-</ul>
-
+# Test the usage of _has_changed
+>>> w._has_changed(None, None)
+False
+>>> w._has_changed([], None)
+False
+>>> w._has_changed(None, [u'1'])
+True
+>>> w._has_changed([1, 2], [u'1', u'2'])
+False
+>>> w._has_changed([1, 2], [u'1'])
+True
+>>> w._has_changed([1, 2], [u'1', u'3'])
+True
+
-# Unicode choices are correctly rendered as HTML
->>> w.render('nums', ['ŠĐĆŜćşšđ'], choices=[('ŠĐĆŜćşšđ', 'ŠĐabcĆŜćşšđ'), ('ćşšđ', 'abcćşšđ')])