diff --git a/development/Dockerfile b/development/Dockerfile index f5fc69d..dfb8d62 100644 --- a/development/Dockerfile +++ b/development/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim-buster +FROM python:3.12-slim ENV PYTHONUNBUFFERED 1 ENV PYTHONDONTWRITEBYTECODE 1 diff --git a/netbox_config_diff/templates/netbox_config_diff/configcompliance/data.html b/netbox_config_diff/templates/netbox_config_diff/configcompliance/data.html index 17c5440..f2f1324 100644 --- a/netbox_config_diff/templates/netbox_config_diff/configcompliance/data.html +++ b/netbox_config_diff/templates/netbox_config_diff/configcompliance/data.html @@ -1,5 +1,6 @@ {% extends base_template %} {% load static %} +{% load string_filters %} {% block content %}
@@ -73,7 +74,7 @@

Diff stickyFileHeaders: false, drawFileList: false, }; - const jsonDiff = `{{ instance.diff|escapejs|safe }}`; + const jsonDiff = `{{ instance.diff|escapejs|safe|replace:'${,\${' }}`; var targetElement = document.getElementById('diffElement'); var diff2htmlUi = new Diff2HtmlUI(targetElement, jsonDiff, configuration); diff2htmlUi.draw(); diff --git a/netbox_config_diff/templatetags/__init__.py b/netbox_config_diff/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/netbox_config_diff/templatetags/string_filters.py b/netbox_config_diff/templatetags/string_filters.py new file mode 100644 index 0000000..4890ee8 --- /dev/null +++ b/netbox_config_diff/templatetags/string_filters.py @@ -0,0 +1,10 @@ +from django import template + +register = template.Library() + + +@register.filter +def replace(value: str, arg: str) -> str: + old, new = arg.split(",") + + return value.replace(old, new)