From 6285662c40181a45aec62cfd5720036f0e59b12f Mon Sep 17 00:00:00 2001 From: meganerd Date: Fri, 7 Feb 2025 17:03:23 -0500 Subject: [PATCH] repeat change from #726 --- nautobot_golden_config/models.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nautobot_golden_config/models.py b/nautobot_golden_config/models.py index bbe840e5..c6739fac 100644 --- a/nautobot_golden_config/models.py +++ b/nautobot_golden_config/models.py @@ -371,14 +371,18 @@ def to_objectchange( self, action, *, related_object=None, object_data_extra=None, object_data_exclude=None ): # pylint: disable=arguments-differ """Remove actual and intended configuration from changelog.""" + fields_to_exclude = ["actual", "intended"] if not object_data_exclude: - object_data_exclude = ["actual", "intended"] + object_data_exclude = fields_to_exclude + data_v2 = serialize_object_v2(self) + for field in fields_to_exclude: + data_v2.pop(field) return ObjectChange( changed_object=self, object_repr=str(self), action=action, object_data=serialize_object(self, extra=object_data_extra, exclude=object_data_exclude), - object_data_v2=serialize_object_v2(self), + object_data_v2=data_v2, related_object=related_object, ) @@ -491,14 +495,16 @@ def to_objectchange( self, action, *, related_object=None, object_data_extra=None, object_data_exclude=None ): # pylint: disable=arguments-differ """Remove actual and intended configuration from changelog.""" + fields_to_exclude = ["backup_config", "intended_config", "compliance_config"] if not object_data_exclude: - object_data_exclude = ["backup_config", "intended_config", "compliance_config"] + object_data_exclude = fields_to_exclude + data_v2 = serialize_object_v2(self) return ObjectChange( changed_object=self, object_repr=str(self), action=action, object_data=serialize_object(self, extra=object_data_extra, exclude=object_data_exclude), - object_data_v2=serialize_object_v2(self), + object_data_v2=data_v2, related_object=related_object, )