Merge branch 'history-diff-view' into 'main'

History diff view

See merge request reportcreator/reportcreator!402

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Next
+* Diff-view for version history
+
+
 ## v2024.3 - 2024-01-09
 * Fix PDF viewer crash in Chrome with Bitwarden browser extension
 

api/src/reportcreator_api/tests/test_rendering.py

@@ -40,7 +40,7 @@ def setUp(self):
     def render_html(self, template, additional_data={}):
         def render_only_html(data, language, **kwargs):
             html, msgs = render_to_html(template=template, styles='@import url("/assets/global/base.css");', data=merge(data, additional_data), resources={}, language=language)
-            return html.encode() if html else None, [m.to_dict() for m in msgs]
+            return html.encode() if html else None, msgs
 
         with mock.patch('reportcreator_api.tasks.rendering.render.render_pdf', render_only_html):
             res = async_to_sync(render_pdf)(self.project)

api/src/reportcreator_api/utils/history.py

@@ -172,7 +172,9 @@ def history_context(override_existing=False, history_date=None, **kwargs):
     Set history context information such as history_date, history_change_reason, history_prevent_cleanup, etc.
     If override_existing is False, context information set in an outer history_context() call will not be overwritten and only new infos will be added.
     """
-    kwargs = kwargs | {'history_date': history_date or timezone.now()}
+    kwargs = {
+        'history_date': history_date or timezone.now()
+    } | kwargs
     restore_map = {}
     try:
         for k, v in kwargs.items():