mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Closes #6493: show ObjectChange diff for non-atomic changes

Browse Source
This commit is contained in:
drmsoffall
2021-06-05 18:46:52 +00:00
parent b3a14e9a7b
commit a224e5d470
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/extras/views.py
View File

@@ -202,15 +202,22 @@ class ObjectChangeView(generic.ObjectView):
next_change = objectchanges.filter(time__gt=instance.time).order_by('time').first() next_change = objectchanges.filter(time__gt=instance.time).order_by('time').first()
prev_change = objectchanges.filter(time__lt=instance.time).order_by('-time').first() prev_change = objectchanges.filter(time__lt=instance.time).order_by('-time').first()
if instance.prechange_data and instance.postchange_data: if not instance.prechange_data and instance.action in ['update', 'delete'] and prev_change:
non_atomic_change = True
prechange_data = prev_change.postchange_data
else:
non_atomic_change = False
prechange_data = instance.prechange_data
if prechange_data and instance.postchange_data:
diff_added = shallow_compare_dict( diff_added = shallow_compare_dict(
instance.prechange_data or dict(), prechange_data or dict(),
instance.postchange_data or dict(), instance.postchange_data or dict(),
exclude=['last_updated'], exclude=['last_updated'],
) )
diff_removed = { diff_removed = {
x: instance.prechange_data.get(x) for x in diff_added x: prechange_data.get(x) for x in diff_added
} if instance.prechange_data else {} } if prechange_data else {}
else: else:
diff_added = None diff_added = None
diff_removed = None diff_removed = None
@@ -221,7 +228,8 @@ class ObjectChangeView(generic.ObjectView):
'next_change': next_change, 'next_change': next_change,
'prev_change': prev_change, 'prev_change': prev_change,
'related_changes_table': related_changes_table, 'related_changes_table': related_changes_table,
'related_changes_count': related_changes.count() 'related_changes_count': related_changes.count(),
'non_atomic_change': non_atomic_change
} }

2
netbox/templates/extras/objectchange.html
View File

@@ -128,6 +128,8 @@
<span{% if k in diff_removed %} style="background-color: #ffdce0"{% endif %}>{{ k }}: {{ v|render_json }}</span> <span{% if k in diff_removed %} style="background-color: #ffdce0"{% endif %}>{{ k }}: {{ v|render_json }}</span>
{% endspaceless %} {% endspaceless %}
{% endfor %}</pre> {% endfor %}</pre>
{% elif non_atomic_change %}
Warning: Comparing non-atomic change to previous change record (<a href="{% url 'extras:objectchange' pk=prev_change.pk %}">{{ prev_change.pk }}</a>)
{% else %} {% else %}
<span class="text-muted">None</span> <span class="text-muted">None</span>
{% endif %} {% endif %}