Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use DjangoJSONEncoder on ArrayFormField to support datetime, UUID, Decimal, etc. #142

Merged
merged 3 commits into from
Feb 4, 2024
Merged

use DjangoJSONEncoder on ArrayFormField to support datetime, UUID, Decimal, etc. #142

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8a86ad
fix Decimal support on ArrayFormField
nullcode Feb 2, 2024
b3c9d69
optimise if
nullcode Feb 2, 2024
5299f23
use DjangoJSONEncoder for json dumps
nullcode Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions django_jsonform/forms/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import json
from uuid import UUID
import django
from django.db import models
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured, ValidationError
from django.core.serializers.json import DjangoJSONEncoder
from django_jsonform.utils import _get_django_version

django_major, django_minor = _get_django_version()
Expand Down Expand Up @@ -75,13 +75,6 @@ def add_error(self, error_map):
self.widget.add_error(error_map)


class UUIDCompatibleEncoder(json.JSONEncoder):
def default(self, obj):
if isinstance(obj, UUID):
return str(obj)
return json.JSONEncoder.default(self, obj)


class ArrayFormField(SimpleArrayField):
def __init__(self, base_field, **kwargs):
if hasattr(SimpleArrayField, 'mock_field'):
Expand All @@ -103,7 +96,7 @@ def __init__(self, base_field, **kwargs):

def prepare_value(self, value):
if isinstance(value, list):
return json.dumps(value, cls=UUIDCompatibleEncoder)
return json.dumps(value, cls=DjangoJSONEncoder)
return value

def to_python(self, value):
Expand Down
Loading