Merge branch 'main' into CA-702-workshop-2-UX

intuitem · Dec 13, 2024 · 09a294f · 09a294f
2 parents e83bce1 + 366e5e1
commit 09a294f
Show file tree

Hide file tree

Showing 45 changed files with 1,411 additions and 432 deletions.
diff --git a/backend/core/locale/fr/LC_MESSAGES/django.mo b/backend/core/locale/fr/LC_MESSAGES/django.mo
diff --git a/backend/core/locale/fr/LC_MESSAGES/django.po b/backend/core/locale/fr/LC_MESSAGES/django.po
diff --git a/backend/core/management/commands/reset_mail.py b/backend/core/management/commands/reset_mail.py
@@ -2,6 +2,7 @@
 from core.models import *
 from iam.models import User, Folder
 from ciso_assistant.settings import CISO_ASSISTANT_SUPERUSER_EMAIL
+from django.utils.translation import gettext_lazy as _
 
 
 class Command(BaseCommand):
@@ -13,7 +14,7 @@ def handle(self, *args, **kwargs):
         try:
             admin.mailing(
                 email_template_name="registration/password_reset_email.html",
-                subject="CISO Assistant: Password Reset",
+                subject=_("CISO Assistant: Password Reset"),
             )
             self.stdout.write("reset mail sent")
         except Exception as e:

diff --git a/backend/core/serializers.py b/backend/core/serializers.py
@@ -216,6 +216,14 @@ class Meta:
 
 
 class AssetWriteSerializer(BaseModelSerializer):
+    ebios_rm_studies = serializers.PrimaryKeyRelatedField(
+        many=True,
+        queryset=EbiosRMStudy.objects.all(),
+        required=False,
+        allow_null=True,
+        write_only=True,
+    )
+
     class Meta:
         model = Asset
         fields = "__all__"

diff --git a/backend/locale/fr/LC_MESSAGES/django.mo b/backend/locale/fr/LC_MESSAGES/django.mo