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

Closes #14690: Pretty-format JSON fields in the config form #15623

Merged
merged 4 commits into from
Apr 22, 2024
Merged

Closes #14690: Pretty-format JSON fields in the config form #15623

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d4d347
Closes #14690: Pretty-format JSON fields in the config form
markkuleinio Jan 20, 2024
1d741b7
Revert changes
markkuleinio Apr 18, 2024
a7b9498
Use our own JSONField for config parameters for pretty editor outputs
markkuleinio Apr 18, 2024
adc2c93
Compare identity instead of equality
markkuleinio Apr 18, 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
6 changes: 5 additions & 1 deletion netbox/core/forms/model_forms.py
View file
Open in desktop
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
Loading