Commit 49c2f23e authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[1.2.X] Fixed #14158 -- Fixed SelectMultiple._has_changed to not assume same... 

[1.2.X] Fixed #14158 -- Fixed SelectMultiple._has_changed to not assume same order of data anymore. Thanks, akaariai and dmoisset.

Backport from trunk (r14887).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 32bf35da

django/forms/widgets.py

+3 −4
Original line number Diff line number Diff line
@@ -527,10 +527,9 @@ class SelectMultiple(Select): 
            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

        initial_set = set([force_unicode(value) for value in initial])

        data_set = set([force_unicode(value) for value in data])

        return data_set != initial_set



class RadioInput(StrAndUnicode):

    """

tests/regressiontests/forms/tests/widgets.py

+1 −0
Original line number Diff line number Diff line
@@ -830,6 +830,7 @@ beatle J R Ringo False""") 
        self.assertFalse(w._has_changed([1, 2], [u'1', u'2']))

        self.assertTrue(w._has_changed([1, 2], [u'1']))

        self.assertTrue(w._has_changed([1, 2], [u'1', u'3']))

        self.assertFalse(w._has_changed([2, 1], [u'1', u'2']))



        # Unicode choices are correctly rendered as HTML

        self.assertEqual(w.render('nums', ['ŠĐĆŽćžšđ'], choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')]), u'<ul>\n<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>\n<li><label><input type="checkbox" name="nums" value="2" /> 2</label></li>\n<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>\n<li><label><input checked="checked" type="checkbox" name="nums" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" /> \u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</label></li>\n<li><label><input type="checkbox" name="nums" value="\u0107\u017e\u0161\u0111" /> abc\u0107\u017e\u0161\u0111</label></li>\n</ul>')