Merge pull request derek-schaefer#12 from robthehall/master

Allow an empty value on an optional formfield

Author: derek-schaefer

json_field/forms.py

@@ -16,6 +16,10 @@ def clean(self, value):
         # Have to jump through a few hoops to make this reliable
         value = super(JSONFormField, self).clean(value)
 
+        # allow an empty value on an optional field
+        if value is None:
+            return value
+
         ## Got to get rid of newlines for validation to work
         # Data newlines are escaped so this is safe
         value = value.replace('\r', '').replace('\n', '')

test_project/app/forms.py

@@ -4,3 +4,6 @@
 
 class TestForm(Form):
     json = JSONFormField()
+
+class OptionalForm(Form):
+    json = JSONFormField(required=False)

test_project/app/tests.py

@@ -1,5 +1,5 @@
 from test_project.app.models import Test
-from test_project.app.forms import TestForm
+from test_project.app.forms import TestForm, OptionalForm
 
 from django.test import TestCase
 from django.db.utils import IntegrityError
@@ -107,3 +107,8 @@ def test_formfield(self):
         f1 = TestForm(data)
         self.assertTrue(f1.is_valid())
         self.assertEqual(f1.cleaned_data, data)
+        f2 = TestForm({})
+        self.assertFalse(f2.is_valid())
+        f3 = OptionalForm({})
+        self.assertTrue(f3.is_valid())
+        self.assertEqual(f3.cleaned_data, {'json': None})