Skip to content

Commit

Permalink
Closes #14690: Pretty-format JSON fields in the config form (#15623)
Browse files Browse the repository at this point in the history
* Closes #14690: Pretty-format JSON fields in the config form

* Revert changes

* Use our own JSONField for config parameters for pretty editor outputs

* Compare identity instead of equality
  • Loading branch information
markkuleinio authored Apr 22, 2024
1 parent 90d0104 commit b6e38b2
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion netbox/core/forms/model_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from django import forms
from django.conf import settings
from django.forms.fields import JSONField as _JSONField
from django.utils.translation import gettext_lazy as _

from core.forms.mixins import SyncedDataMixin
Expand All @@ -12,7 +13,7 @@
from netbox.registry import registry
from netbox.utils import get_data_backend_choices
from utilities.forms import BootstrapMixin, get_field_value
from utilities.forms.fields import CommentField
from utilities.forms.fields import CommentField, JSONField
from utilities.forms.widgets import HTMXSelect

__all__ = (
Expand Down Expand Up @@ -132,6 +133,9 @@ def __new__(mcs, name, bases, attrs):
'help_text': param.description,
}
field_kwargs.update(**param.field_kwargs)
if param.field is _JSONField:
# Replace with our own JSONField to get pretty JSON in config editor
param.field = JSONField
param_fields[param.name] = param.field(**field_kwargs)
attrs.update(param_fields)

Expand Down

0 comments on commit b6e38b2

Please sign in to comment.