Merge pull request #206 from eaterek/django_json_serializer

Use DjangoJSONEncoder - which handles additional django types including UUID

ajax_select/fields.py

@@ -4,6 +4,7 @@
 from django import forms
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
+from django.core.serializers.json import DjangoJSONEncoder
 from django.db.models.query import QuerySet
 from django.forms.utils import flatatt
 from django.template.defaultfilters import force_escape
@@ -217,7 +218,9 @@ def render(self, name, value, attrs=None):
             'html_id': self.html_id,
             'current': value,
             'current_ids': current_ids,
-            'current_reprs': mark_safe(json.dumps(initial)),
+            'current_reprs': mark_safe(
+                json.dumps(initial, cls=DjangoJSONEncoder)
+            ),
             'help_text': help_text,
             'extra_attrs': mark_safe(flatatt(final_attrs)),
             'func_slug': self.html_id.replace("-", ""),
@@ -441,8 +444,10 @@ def make_plugin_options(lookup, channel_name, widget_plugin_options, initial):
         po['html'] = True
 
     return {
-        'plugin_options': mark_safe(json.dumps(po)),
-        'data_plugin_options': force_escape(json.dumps(po))
+        'plugin_options': mark_safe(json.dumps(po, cls=DjangoJSONEncoder)),
+        'data_plugin_options': force_escape(
+            json.dumps(po, cls=DjangoJSONEncoder)
+        )
     }