mirror of
https://github.com/django/django.git
synced 2025-11-07 07:15:35 +00:00
[1.11.x] Fixed #28387 -- Fixed has_changed() for disabled form fields that subclass it.
Backport of 5debbdfcc8 from master
This commit is contained in:
committed by
Tim Graham
parent
fc6b90bdb7
commit
a3b5df8ed5
@@ -59,3 +59,7 @@ class BooleanFieldTest(SimpleTestCase):
|
||||
self.assertFalse(f.has_changed(True, 'True'))
|
||||
self.assertTrue(f.has_changed(False, 'True'))
|
||||
self.assertTrue(f.has_changed(True, 'False'))
|
||||
|
||||
def test_disabled_has_changed(self):
|
||||
f = BooleanField(disabled=True)
|
||||
self.assertIs(f.has_changed('True', 'False'), False)
|
||||
|
||||
@@ -77,5 +77,9 @@ class FileFieldTest(SimpleTestCase):
|
||||
# with here)
|
||||
self.assertTrue(f.has_changed('resume.txt', {'filename': 'resume.txt', 'content': 'My resume'}))
|
||||
|
||||
def test_disabled_has_changed(self):
|
||||
f = FileField(disabled=True)
|
||||
self.assertIs(f.has_changed('x', 'y'), False)
|
||||
|
||||
def test_file_picklable(self):
|
||||
self.assertIsInstance(pickle.loads(pickle.dumps(FileField())), FileField)
|
||||
|
||||
@@ -70,3 +70,7 @@ class MultipleChoiceFieldTest(SimpleTestCase):
|
||||
self.assertFalse(f.has_changed([2, 1], ['1', '2']))
|
||||
self.assertTrue(f.has_changed([1, 2], ['1']))
|
||||
self.assertTrue(f.has_changed([1, 2], ['1', '3']))
|
||||
|
||||
def test_disabled_has_changed(self):
|
||||
f = MultipleChoiceField(choices=[('1', 'One'), ('2', 'Two')], disabled=True)
|
||||
self.assertIs(f.has_changed('x', 'y'), False)
|
||||
|
||||
@@ -103,6 +103,10 @@ class MultiValueFieldTest(SimpleTestCase):
|
||||
['some text', ['J', 'P'], ['2009-04-25', '11:44:00']],
|
||||
))
|
||||
|
||||
def test_disabled_has_changed(self):
|
||||
f = MultiValueField(fields=(CharField(), CharField()), disabled=True)
|
||||
self.assertIs(f.has_changed(['x', 'x'], ['y', 'y']), False)
|
||||
|
||||
def test_form_as_table(self):
|
||||
form = ComplexFieldForm()
|
||||
self.assertHTMLEqual(
|
||||
|
||||
Reference in New Issue
Block a user