Fixed rendering and empty values

Author: nnseva

jsoneditor/forms.py

@@ -5,15 +5,19 @@
 
 from django.conf import settings
 
+import json
+
 class JSONEditor(Textarea):
     class Media:
         js = (
             getattr(settings,"JSON_EDITOR_JS",settings.STATIC_URL+'jsoneditor/jsoneditor.js'),
-            getattr(settings,"JSON_EDITOR_JS",settings.STATIC_URL+'django-jsoneditor/django-jsoneditor.js'),
+            settings.STATIC_URL+'django-jsoneditor/django-jsoneditor.js',
         )
         css= {'all': ( getattr(settings, "JSON_EDITOR_CSS",settings.STATIC_URL+'jsoneditor/jsoneditor.css'),)}
 
     def render(self, name, value, attrs=None):
+        if not isinstance(value,basestring):
+           value = json.dumps(value)
         input_attrs = {'hidden':True}
         input_attrs.update(attrs)
         if not 'class' in input_attrs:

jsoneditor/static/django-jsoneditor/django-jsoneditor.js

@@ -11,7 +11,7 @@ django.jQuery(function() {
             if($nxt.attr("name") == name) {
                 continue;
             }
-            var value;
+            var value = {};
             try {
                 value = JSON.parse($f[0].value);
             } catch(e) {

testapp/admin.py

@@ -3,7 +3,19 @@
 from . import models
 # Register your models here.
 
+class TestStackedInline(admin.StackedInline):
+    model = models.TestSubModel1
+    extra = 1
+
+class TestTabularInline(admin.StackedInline):
+    model = models.TestSubModel2
+    extra = 1
+
 class TestAdmin(admin.ModelAdmin):
+    inlines = (
+            TestStackedInline,
+            TestTabularInline
+    )
     pass
 
 admin.site.register(models.TestModel,TestAdmin)

testapp/migrations/0001_initial.py

@@ -20,4 +20,20 @@ class Migration(migrations.Migration):
                 ('test_django_jsonfield', jsoneditor.fields.django_jsonfield.JSONField(help_text=b'Test JSON editor for the django-jsonfield from https://github.com/bradjasper/django-jsonfield', null=True, verbose_name=b'Test JSON 2', blank=True)),
             ],
         ),
+        migrations.CreateModel(
+            name='TestSubModel1',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('test_inline_json_field', jsoneditor.fields.django_json_field.JSONField(default='null', help_text=b'Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field', null=True, verbose_name=b'Test JSON 1', blank=True)),
+                ('par', models.ForeignKey(to='testapp.TestModel')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TestSubModel2',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('test_inline_json_field', jsoneditor.fields.django_json_field.JSONField(default='null', help_text=b'Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field', null=True, verbose_name=b'Test JSON 1', blank=True)),
+                ('par', models.ForeignKey(to='testapp.TestModel')),
+            ],
+        ),
     ]

testapp/models.py

@@ -7,3 +7,11 @@
 class TestModel(models.Model):
     test_django_json_field = JSONField1(verbose_name="Test JSON 1",null=True,blank=True,help_text="Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field")
     test_django_jsonfield = JSONField2(verbose_name="Test JSON 2",null=True,blank=True,help_text="Test JSON editor for the django-jsonfield from https://github.com/bradjasper/django-jsonfield")
+
+class TestSubModel1(models.Model):
+    par = models.ForeignKey(TestModel)
+    test_inline_json_field = JSONField1(verbose_name="Test JSON 1",null=True,blank=True,help_text="Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field")
+
+class TestSubModel2(models.Model):
+    par = models.ForeignKey(TestModel)
+    test_inline_json_field = JSONField1(verbose_name="Test JSON 1",null=True,blank=True,help_text="Test JSON editor for the django-json-field from https://github.com/derek-schaefer/django-json-field")