.

risks/admin.py

@@ -94,7 +94,7 @@ class RedirectOnSaveMixin:
 @admin.register(Risk)
 class RiskAdmin(ChangedByMixin, RedirectOnSaveMixin, admin.ModelAdmin):
     redirect_url_name = "risks:show_risk"
-    list_display = ("title", "owner_name", "status", "score", "level", "likelihood", "impact", "follow_up")
+    list_display = ("title", "owner_name", "score", "level", "likelihood", "impact", "follow_up", "status")
     list_filter = ("status", "level", "likelihood", "impact", "owner")
     search_fields = ("title", "asset", "process", "category")
     inlines = [ResidualRiskInline, ControlRisksInline]
@@ -139,6 +139,13 @@ class IncidentAdmin(ChangedByMixin, RedirectOnSaveMixin, admin.ModelAdmin):
     autocomplete_fields = ("related_risks",)
     filter_horizontal = ("related_risks",)
 
+    def get_changeform_initial_data(self, request):
+        initial = super().get_changeform_initial_data(request)
+        risk_id = request.GET.get("related_risks")
+        if risk_id:
+            initial["related_risks"] = [risk_id]
+        return initial
+
 
 # ---------------------------------------------------------------------------
 # Notification

risks/serializers.py

@@ -1,4 +1,5 @@
 from django.contrib.auth import get_user_model
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 from .models import Risk, Control, ResidualRisk, AuditLog, Incident