From 574b5f991d6a739d83550c7e001f1b4784d80d75 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 28 Mar 2023 09:41:54 -0400 Subject: [PATCH] Fix JSON rendering --- netbox/extras/forms/model_forms.py | 8 ++++---- netbox/netbox/models/features.py | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/netbox/extras/forms/model_forms.py b/netbox/extras/forms/model_forms.py index a21cf21e2..3fb8062e6 100644 --- a/netbox/extras/forms/model_forms.py +++ b/netbox/extras/forms/model_forms.py @@ -1,6 +1,7 @@ +import json + from django import forms from django.contrib.contenttypes.models import ContentType -from django.http import QueryDict from django.utils.translation import gettext as _ from dcim.models import DeviceRole, DeviceType, Location, Platform, Region, Site, SiteGroup @@ -128,11 +129,10 @@ class SavedFilterForm(BootstrapMixin, forms.ModelForm): def __init__(self, *args, initial=None, **kwargs): - # Convert any parameters delivered via initial data to a dictionary + # Convert any parameters delivered via initial data to JSON data if initial and 'parameters' in initial: if type(initial['parameters']) is str: - # TODO: Make a utility function for this - initial['parameters'] = dict(QueryDict(initial['parameters']).lists()) + initial['parameters'] = json.loads(initial['parameters']) super().__init__(*args, initial=initial, **kwargs) diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py index 317ecc6eb..71c1a7c5c 100644 --- a/netbox/netbox/models/features.py +++ b/netbox/netbox/models/features.py @@ -1,3 +1,4 @@ +import json from collections import defaultdict from functools import cached_property @@ -110,14 +111,13 @@ class CloningMixin(models.Model): for field_name in getattr(self, 'clone_fields', []): field = self._meta.get_field(field_name) - if isinstance(field, models.ManyToManyField): - m2m = getattr(self, field.name) - if m2m: - attrs[field_name] = [f.pk for f in m2m.all()] - else: - field_value = field.value_from_object(self) - if field_value not in (None, ''): - attrs[field_name] = field_value + field_value = field.value_from_object(self) + if field_value and isinstance(field, models.ManyToManyField): + attrs[field_name] = [v.pk for v in field_value] + elif field_value and isinstance(field, models.JSONField): + attrs[field_name] = json.dumps(field_value) + elif field_value not in (None, ''): + attrs[field_name] = field_value # Include tags (if applicable) if is_taggable(self):