Merge branch 'master' into nanterre-recette

zoo/zoo_data/admin.py

@@ -40,7 +40,7 @@ class JSONEditorMixin(object):
     def get_form(self, request, obj=None, **kwargs):
         widgets = kwargs.setdefault('widgets', {})
         for field in self.json_fields:
-            if obj:
+            if obj and hasattr(obj, 'schema'):
                 schema = obj.schema.schema
             else:
                 schema = {}