diff --git a/dojo/templates/dojo/test_pdf_report.html b/dojo/templates/dojo/test_pdf_report.html
index e9ec79d6aa..b1d1cd7b5f 100644
--- a/dojo/templates/dojo/test_pdf_report.html
+++ b/dojo/templates/dojo/test_pdf_report.html
@@ -146,7 +146,7 @@
{% if include_disclaimer%}
Disclaimer
-
{{ disclaimer }}
+
{{ disclaimer | safe }}
{% endif %}
From 613061212e8665e584a1d5cfac706f20413ca499 Mon Sep 17 00:00:00 2001
From: kiblik <5609770+kiblik@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:34:12 +0100
Subject: [PATCH 6/8] Add reverse_code to DB migration
---
dojo/db_migrations/0220_system_settings_disclaimer_notif.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dojo/db_migrations/0220_system_settings_disclaimer_notif.py b/dojo/db_migrations/0220_system_settings_disclaimer_notif.py
index ceb126d6ab..3a6910381f 100644
--- a/dojo/db_migrations/0220_system_settings_disclaimer_notif.py
+++ b/dojo/db_migrations/0220_system_settings_disclaimer_notif.py
@@ -17,5 +17,5 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.RunPython(copy_notif_field),
+ migrations.RunPython(copy_notif_field, reverse_code=migrations.RunPython.noop),
]
From d1e7c55906ccec9e6be7483c5a37f888fc41c3b2 Mon Sep 17 00:00:00 2001
From: kiblik <5609770+kiblik@users.noreply.github.com>
Date: Wed, 15 Jan 2025 17:23:44 +0100
Subject: [PATCH 7/8] Add info to upgrade notes
---
docs/content/en/open_source/upgrading/2.43.md | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/docs/content/en/open_source/upgrading/2.43.md b/docs/content/en/open_source/upgrading/2.43.md
index faa443cfea..596b2a0080 100644
--- a/docs/content/en/open_source/upgrading/2.43.md
+++ b/docs/content/en/open_source/upgrading/2.43.md
@@ -2,6 +2,9 @@
title: 'Upgrading to DefectDojo Version 2.43.x'
toc_hide: true
weight: -20250106
-description: No special instructions.
+description: Disclaimer field renamed/split.
---
-There are no special instructions for upgrading to 2.43.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.43.0) for the contents of the release.
+
+[Pull request #10902](https://github.com/DefectDojo/django-DefectDojo/pull/10902) introduced different kinds of disclaimers within the DefectDojo instance. The original content of the disclaimer was copied to all new fields where it had been used until now (so this change does not require any action on the user's side). However, if users were managing the original disclaimer via API (endpoint `/api/v2/system_settings/1/`, field `disclaimer`), be aware that the fields are now called `disclaimer_notifications` and `disclaimer_reports` (plus there is one additional, previously unused field called `disclaimer_notes`).
+
+But there are no other special instructions for upgrading to 2.43.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.43.0) for the contents of the release.
From 564ccdcdbef8d8f8cec078019caf40cb99209b6a Mon Sep 17 00:00:00 2001
From: kiblik <5609770+kiblik@users.noreply.github.com>
Date: Tue, 21 Jan 2025 21:50:05 +0100
Subject: [PATCH 8/8] Inc db-mig
---
.../0219_system_settings_disclaimer_notif.py | 38 -------------------
.../0220_system_settings_disclaimer_notif.py | 37 +++++++++++++-----
.../0221_system_settings_disclaimer_notif.py | 21 ++++++++++
3 files changed, 48 insertions(+), 48 deletions(-)
delete mode 100644 dojo/db_migrations/0219_system_settings_disclaimer_notif.py
create mode 100644 dojo/db_migrations/0221_system_settings_disclaimer_notif.py
diff --git a/dojo/db_migrations/0219_system_settings_disclaimer_notif.py b/dojo/db_migrations/0219_system_settings_disclaimer_notif.py
deleted file mode 100644
index 4f57cad2f1..0000000000
--- a/dojo/db_migrations/0219_system_settings_disclaimer_notif.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Generated by Django 5.0.8 on 2024-09-12 18:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('dojo', '0218_system_settings_enforce_verified_status_and_more'),
- ]
-
- operations = [
- migrations.RenameField(
- model_name='system_settings',
- old_name='disclaimer',
- new_name='disclaimer_notifications',
- ),
- migrations.AlterField(
- model_name='system_settings',
- name='disclaimer_notifications',
- field=models.TextField(blank=True, default='', help_text='Include this custom disclaimer on all notifications', max_length=3000, verbose_name='Custom Disclaimer for Notifications'),
- ),
- migrations.AddField(
- model_name='system_settings',
- name='disclaimer_reports',
- field=models.TextField(blank=True, default='', help_text='Include this custom disclaimer on generated reports', max_length=5000, verbose_name='Custom Disclaimer for Reports'),
- ),
- migrations.AddField(
- model_name='system_settings',
- name='disclaimer_notes',
- field=models.TextField(blank=True, default='', help_text='Include this custom disclaimer next to input form for notes', max_length=3000, verbose_name='Custom Disclaimer for Notes'),
- ),
- migrations.AddField(
- model_name='system_settings',
- name='disclaimer_reports_forced',
- field=models.BooleanField(default=False, help_text="Disclaimer will be added to all reports even if user didn't selected 'Include disclaimer'.", verbose_name='Force to add disclaimer reports'),
- ),
- ]
diff --git a/dojo/db_migrations/0220_system_settings_disclaimer_notif.py b/dojo/db_migrations/0220_system_settings_disclaimer_notif.py
index 3a6910381f..77a9d836c7 100644
--- a/dojo/db_migrations/0220_system_settings_disclaimer_notif.py
+++ b/dojo/db_migrations/0220_system_settings_disclaimer_notif.py
@@ -1,21 +1,38 @@
# Generated by Django 5.0.8 on 2024-09-12 18:22
-from django.db import migrations
-
-
-def copy_notif_field(apps, schema_editor):
- system_settings_model = apps.get_model('dojo', 'System_Settings').objects.get()
- if system_settings_model.disclaimer_notifications:
- system_settings_model.disclaimer_reports = system_settings_model.disclaimer_notifications
- system_settings_model.save()
+from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('dojo', '0219_system_settings_disclaimer_notif'),
+ ('dojo', '0219_system_settings_enforce_verified_status_jira_and_more'),
]
operations = [
- migrations.RunPython(copy_notif_field, reverse_code=migrations.RunPython.noop),
+ migrations.RenameField(
+ model_name='system_settings',
+ old_name='disclaimer',
+ new_name='disclaimer_notifications',
+ ),
+ migrations.AlterField(
+ model_name='system_settings',
+ name='disclaimer_notifications',
+ field=models.TextField(blank=True, default='', help_text='Include this custom disclaimer on all notifications', max_length=3000, verbose_name='Custom Disclaimer for Notifications'),
+ ),
+ migrations.AddField(
+ model_name='system_settings',
+ name='disclaimer_reports',
+ field=models.TextField(blank=True, default='', help_text='Include this custom disclaimer on generated reports', max_length=5000, verbose_name='Custom Disclaimer for Reports'),
+ ),
+ migrations.AddField(
+ model_name='system_settings',
+ name='disclaimer_notes',
+ field=models.TextField(blank=True, default='', help_text='Include this custom disclaimer next to input form for notes', max_length=3000, verbose_name='Custom Disclaimer for Notes'),
+ ),
+ migrations.AddField(
+ model_name='system_settings',
+ name='disclaimer_reports_forced',
+ field=models.BooleanField(default=False, help_text="Disclaimer will be added to all reports even if user didn't selected 'Include disclaimer'.", verbose_name='Force to add disclaimer reports'),
+ ),
]
diff --git a/dojo/db_migrations/0221_system_settings_disclaimer_notif.py b/dojo/db_migrations/0221_system_settings_disclaimer_notif.py
new file mode 100644
index 0000000000..8a97935064
--- /dev/null
+++ b/dojo/db_migrations/0221_system_settings_disclaimer_notif.py
@@ -0,0 +1,21 @@
+# Generated by Django 5.0.8 on 2024-09-12 18:22
+
+from django.db import migrations
+
+
+def copy_notif_field(apps, schema_editor):
+ system_settings_model = apps.get_model('dojo', 'System_Settings').objects.get()
+ if system_settings_model.disclaimer_notifications:
+ system_settings_model.disclaimer_reports = system_settings_model.disclaimer_notifications
+ system_settings_model.save()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dojo', '0220_system_settings_disclaimer_notif'),
+ ]
+
+ operations = [
+ migrations.RunPython(copy_notif_field, reverse_code=migrations.RunPython.noop),
+ ]