From 1d741b79e1e0c3c1ea81eca2e942fadcb2c232eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markku=20Leini=C3=B6?= Date: Thu, 18 Apr 2024 22:29:25 +0300 Subject: [PATCH] Revert changes --- netbox/core/forms/model_forms.py | 3 --- netbox/netbox/config/parameters.py | 8 -------- 2 files changed, 11 deletions(-) diff --git a/netbox/core/forms/model_forms.py b/netbox/core/forms/model_forms.py index c617d0cd3..ae891dd59 100644 --- a/netbox/core/forms/model_forms.py +++ b/netbox/core/forms/model_forms.py @@ -207,9 +207,6 @@ class ConfigRevisionForm(BootstrapMixin, forms.ModelForm, metaclass=ConfigFormMe help_text += _(' (default)') self.fields[param.name].help_text = help_text - # Use the parameter-specific encoder - self.fields[param.name].encoder = param.encoder - def save(self, commit=True): instance = super().save(commit=False) diff --git a/netbox/netbox/config/parameters.py b/netbox/netbox/config/parameters.py index 9a62a7630..54c9027cc 100644 --- a/netbox/netbox/config/parameters.py +++ b/netbox/netbox/config/parameters.py @@ -1,15 +1,8 @@ -import json - from django import forms from django.contrib.postgres.forms import SimpleArrayField from django.utils.translation import gettext_lazy as _ -class PrettyJSONEncoder(json.JSONEncoder): - def __init__(self, indent, sort_keys, *args, **kwargs): - super().__init__(indent=4, sort_keys=True, *args, **kwargs) - - class ConfigParam: def __init__(self, name, label, default, description='', field=None, field_kwargs=None): @@ -19,7 +12,6 @@ class ConfigParam: self.field = field or forms.CharField self.description = description self.field_kwargs = field_kwargs or {} - self.encoder = PrettyJSONEncoder if self.field == forms.JSONField else None PARAMS = (