Fix nav and breadcrumbs for objects, findings and tasks

rocky/templates/header.html

@@ -36,11 +36,11 @@
           </li>
           <li>
             <a href="{% url 'finding_list' organization.code %}"
-               {% if 'finding' in request.path|urlencode %} aria-current="page"{% endif %}>{% translate 'Findings' %}</a>
+               {% if 'finding' in request.path|urlencode or 'Finding' in request.get_full_path|urlencode %} aria-current="page"{% endif %}>{% translate 'Findings' %}</a>
           </li>
           <li>
             <a href="{% url 'ooi_list' organization.code %}"
-               {% if 'objects' in request.path|urlencode %} aria-current="page"{% endif %}>{% translate 'Objects' %}</a>
+            {% if 'objects' in request.path|urlencode and not 'Finding' in request.get_full_path|urlencode %} aria-current="page"{% endif %}>{% translate 'Objects' %}</a>
           </li>
           <li>
             <a href="{% url 'task_list' organization.code %}"

rocky/views/ooi_detail.py

@@ -13,6 +13,7 @@
 from katalogus.views.mixins import BoefjeMixin
 from octopoes.models import OOI
 from rocky import scheduler
+from rocky.views.mixins import OOIBreadcrumbsMixin
 from rocky.views.ooi_detail_related_object import OOIRelatedObjectAddView
 from rocky.views.ooi_view import BaseOOIDetailView
 from tools.forms.base import ObservedAtForm
@@ -29,6 +30,7 @@ class OOIDetailView(
     BoefjeMixin,
     OOIRelatedObjectAddView,
     BaseOOIDetailView,
+    OOIBreadcrumbsMixin,
 ):
     template_name = "oois/ooi_detail.html"
     connector_form_class = ObservedAtForm
@@ -170,7 +172,6 @@ def get_context_data(self, **kwargs):
         context["severity_summary_totals"] = self.get_findings_severity_totals()
         context["possible_boefjes_filter_form"] = filter_form
         context["organization_indemnification"] = self.get_organization_indemnification()
-
         context["scan_history"] = self.get_scan_history()
         context["scan_history_form_fields"] = [
             "scan_history_from",

rocky/views/ooi_list.py

@@ -9,6 +9,7 @@
 from django.urls import reverse_lazy
 from django.utils.translation import gettext_lazy as _
 from django_otp.decorators import otp_required
+from django.urls import reverse
 from requests import RequestException
 from two_factor.views.utils import class_view_decorator
 
@@ -50,6 +51,9 @@ def get_context_data(self, **kwargs):
         context["member"] = self.organization_member
         context["scan_levels"] = [alias for level, alias in SCAN_LEVEL.choices]
         context["organization_indemnification"] = self.get_organization_indemnification
+        context["breadcrumbs"] = [
+            {"url": reverse("ooi_list", kwargs={"organization_code": self.organization.code}), "text": _("Objects")},
+        ]
 
         return context
 

rocky/views/tasks.py

@@ -78,7 +78,6 @@ def get_queryset(self):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["breadcrumbs"] = [
-            {"url": reverse("ooi_list", kwargs={"organization_code": self.organization.code}), "text": _("Objects")},
             {"url": reverse("task_list", kwargs={"organization_code": self.organization.code}), "text": _("Tasks")},
         ]
         return context