Skip to content

Fixes #15896: Retain proper formatting for JSON custom field default values #15903

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

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Fixes #15896: Retain proper formatting for JSON custom field default values #15903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion netbox/extras/models/customfields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import decimal
import json
import re
from datetime import datetime, date

Expand Down Expand Up @@ -484,7 +485,7 @@ def to_form_field(self, set_initial=True, enforce_required=True, enforce_visibil

# JSON
elif self.type == CustomFieldTypeChoices.TYPE_JSON:
field = JSONField(required=required, initial=initial)
field = JSONField(required=required, initial=json.dumps(initial) if initial else '')

# Object
elif self.type == CustomFieldTypeChoices.TYPE_OBJECT:
Expand Down
8 changes: 7 additions & 1 deletion netbox/netbox/forms/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import json

from django import forms
from django.contrib.contenttypes.models import ContentType
from django.db.models import Q
Expand Down Expand Up @@ -34,7 +36,11 @@ def _get_content_type(self):
def _get_form_field(self, customfield):
if self.instance.pk:
form_field = customfield.to_form_field(set_initial=False)
form_field.initial = self.instance.custom_field_data.get(customfield.name, None)
initial = self.instance.custom_field_data.get(customfield.name)
if customfield.type == CustomFieldTypeChoices.TYPE_JSON:
form_field.initial = json.dumps(initial)
else:
form_field.initial = initial
return form_field

return customfield.to_form_field()
Expand Down