NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes #7550: Fix rendering of UTF8-encoded data in change records

Browse Source
This commit is contained in:
jeremystretch 2021-10-19 15:41:19 -04:00
parent 96015aa590
commit 39430e01de
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.0.md
View File

@ -10,6 +10,7 @@
* [#7534](https://github.com/netbox-community/netbox/issues/7534) - Avoid exception when utilizing "create and add another" twice in succession * [#7534](https://github.com/netbox-community/netbox/issues/7534) - Avoid exception when utilizing "create and add another" twice in succession
* [#7544](https://github.com/netbox-community/netbox/issues/7544) - Fix multi-value filtering of custom field objects * [#7544](https://github.com/netbox-community/netbox/issues/7544) - Fix multi-value filtering of custom field objects
* [#7545](https://github.com/netbox-community/netbox/issues/7545) - Fix incorrect display of update/delete events for webhooks * [#7545](https://github.com/netbox-community/netbox/issues/7545) - Fix incorrect display of update/delete events for webhooks
* [#7550](https://github.com/netbox-community/netbox/issues/7550) - Fix rendering of UTF8-encoded data in change records
* [#7556](https://github.com/netbox-community/netbox/issues/7556) - Fix display of version when new release is available * [#7556](https://github.com/netbox-community/netbox/issues/7556) - Fix display of version when new release is available
* [#7584](https://github.com/netbox-community/netbox/issues/7584) - Fix alignment of object identifier under object view * [#7584](https://github.com/netbox-community/netbox/issues/7584) - Fix alignment of object identifier under object view

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

@ -130,12 +130,12 @@
</h5> </h5>
<div class="card-body"> <div class="card-body">
{% if object.postchange_data %} {% if object.postchange_data %}
<pre class="change-data">{% for k, v in object.postchange_data.items %}{% spaceless %} <pre class="change-data">{% for k, v in object.postchange_data.items %}{% spaceless %}
<span{% if k in diff_added %} class="added"{% endif %}>{{ k }}: {{ v|render_json }}</span> <span{% if k in diff_added %} class="added"{% endif %}>{{ k }}: {{ v|render_json }}</span>
{% endspaceless %}{% endfor %} {% endspaceless %}{% endfor %}
</pre> </pre>
{% else %} {% else %}
<span class="text-muted">None</span> <span class="text-muted">None</span>
{% endif %} {% endif %}
</div> </div>
</div> </div>

2
netbox/utilities/templatetags/helpers.py
View File

@ -58,7 +58,7 @@ def render_json(value):
""" """
Render a dictionary as formatted JSON. Render a dictionary as formatted JSON.
""" """
return json.dumps(value, indent=4, sort_keys=True) return json.dumps(value, ensure_ascii=False, indent=4, sort_keys=True)
@register.filter() @register.filter()