NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-03-21 20:18:38 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

#14329 Improve diffs for custom_fields

Browse Source
This commit is contained in:
Arthur
2026-03-17 09:03:57 -07:00
parent 992630d670
commit 45b53ee036
2 changed files with 22 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox/templates/core/objectchange.html
+22 -2
View File
@@ -120,7 +120,17 @@
{% spaceless %}
<pre class="change-data">
{% for k, v in object.prechange_data_clean.items %}
<span{% if k in diff_removed %} class="removed"{% endif %}>{{ k }}: {{ v|json }}</span>
{% with subdiff=diff_removed|get_key:k %}
{% if subdiff.items %}
<span>{{ k }}: {</span>
{% for sub_k, sub_v in v.items %}
<span{% if sub_k in subdiff %} class="removed"{% endif %} style="padding-left: 2em;">{{ sub_k }}: {{ sub_v|json }}</span>
{% endfor %}
<span>}</span>
{% else %}
<span{% if k in diff_removed %} class="removed"{% endif %}>{{ k }}: {{ v|json }}</span>
{% endif %}
{% endwith %}
{% endfor %}
</pre>
{% endspaceless %}
@@ -140,7 +150,17 @@
{% spaceless %}
<pre class="change-data">
{% for k, v in object.postchange_data_clean.items %}
<span{% if k in diff_added %} class="added"{% endif %}>{{ k }}: {{ v|json }}</span>
{% with subdiff=diff_added|get_key:k %}
{% if subdiff.items %}
<span>{{ k }}: {</span>
{% for sub_k, sub_v in v.items %}
<span{% if sub_k in subdiff %} class="added"{% endif %} style="padding-left: 2em;">{{ sub_k }}: {{ sub_v|json }}</span>
{% endfor %}
<span>}</span>
{% else %}
<span{% if k in diff_added %} class="added"{% endif %}>{{ k }}: {{ v|json }}</span>
{% endif %}
{% endwith %}
{% endfor %}
</pre>
{% endspaceless %}
netbox/utilities/tests/test_data.py
-60
View File
@@ -3,7 +3,6 @@ from django.test import TestCase
from utilities.data import (
check_ranges_overlap,
deep_compare_dict,
get_config_value_ci,
ranges_to_string,
ranges_to_string_list,
@@ -101,65 +100,6 @@ class RangeFunctionsTestCase(TestCase):
)
class DeepCompareDictTestCase(TestCase):
def test_no_changes(self):
source = {'a': 1, 'b': 'foo', 'c': {'x': 1, 'y': 2}}
dest = {'a': 1, 'b': 'foo', 'c': {'x': 1, 'y': 2}}
added, removed = deep_compare_dict(source, dest)
self.assertEqual(added, {})
self.assertEqual(removed, {})
def test_scalar_change(self):
source = {'a': 1, 'b': 'foo'}
dest = {'a': 2, 'b': 'foo'}
added, removed = deep_compare_dict(source, dest)
self.assertEqual(added, {'a': 2})
self.assertEqual(removed, {'a': 1})
def test_key_added(self):
source = {'a': 1}
dest = {'a': 1, 'b': 'new'}
added, removed = deep_compare_dict(source, dest)
self.assertEqual(added, {'b': 'new'})
self.assertEqual(removed, {'b': None})
def test_key_removed(self):
source = {'a': 1, 'b': 'old'}
dest = {'a': 1}
added, removed = deep_compare_dict(source, dest)
self.assertEqual(added, {'b': None})
self.assertEqual(removed, {'b': 'old'})
def test_nested_dict_partial_change(self):
"""Only changed sub-keys of a nested dict are included."""
source = {'custom_fields': {'cf1': 'old', 'cf2': 'unchanged'}}
dest = {'custom_fields': {'cf1': 'new', 'cf2': 'unchanged'}}
added, removed = deep_compare_dict(source, dest)
self.assertEqual(added, {'custom_fields': {'cf1': 'new'}})
self.assertEqual(removed, {'custom_fields': {'cf1': 'old'}})
def test_nested_dict_no_change(self):
source = {'name': 'test', 'custom_fields': {'cf1': 'same'}}
dest = {'name': 'test', 'custom_fields': {'cf1': 'same'}}
added, removed = deep_compare_dict(source, dest)
self.assertEqual(added, {})
self.assertEqual(removed, {})
def test_exclude(self):
source = {'a': 1, 'last_updated': '2024-01-01'}
dest = {'a': 2, 'last_updated': '2024-06-01'}
added, removed = deep_compare_dict(source, dest, exclude=['last_updated'])
self.assertEqual(added, {'a': 2})
self.assertEqual(removed, {'a': 1})
def test_deeply_nested(self):
source = {'level1': {'level2': {'val': 'old', 'other': 'same'}}}
dest = {'level1': {'level2': {'val': 'new', 'other': 'same'}}}
added, removed = deep_compare_dict(source, dest)
self.assertEqual(added, {'level1': {'level2': {'val': 'new'}}})
self.assertEqual(removed, {'level1': {'level2': {'val': 'old'}}})
class GetConfigValueCITestCase(TestCase):