option to delete report

amyasnikov · Dec 4, 2023 · 53b5cb5 · 53b5cb5
1 parent 7bee7b7
commit 53b5cb5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/validity/api/views.py b/validity/api/views.py
@@ -64,9 +64,10 @@ class NameSetViewSet(NetBoxModelViewSet):
     filterset_class = filtersets.NameSetFilterSet
 
 
-class ComplianceReportViewSet(ReadOnlyNetboxViewSet):
+class ComplianceReportViewSet(NetBoxModelViewSet):
     queryset = models.ComplianceReport.objects.annotate_result_stats().count_devices_and_tests()
     serializer_class = serializers.ComplianceReportSerializer
+    http_method_names = ["get", "head", "options", "trace", "delete"]
 
 
 class DeviceReportView(ListAPIView):

diff --git a/validity/models/report.py b/validity/models/report.py
@@ -11,4 +11,7 @@ class Meta:
         ordering = ("-created",)
 
     def __str__(self) -> str:
-        return f"report-{self.pk}"
+        # Without this hack django.messages displays report deletion as "Deleted report-None"
+        if "__str__" not in self.__dict__:
+            self.__dict__["__str__"] = f"report-{self.pk}"
+        return self.__dict__["__str__"]
diff --git a/validity/tables.py b/validity/tables.py
@@ -11,6 +11,7 @@
 from django_tables2 import Column, RequestConfig, Table, TemplateColumn
 from netbox.tables import BooleanColumn as BooleanColumn
 from netbox.tables import ChoiceFieldColumn, ManyToManyColumn, NetBoxTable
+from netbox.tables.columns import ActionsColumn
 from utilities.paginator import EnhancedPaginator
 
 from validity import models
@@ -151,6 +152,7 @@ class ComplianceReportTable(NetBoxTable):
     low_stats = StatsColumn(data_prefix="low", verbose_name=_("Low Severity"), empty_values=())
     middle_stats = StatsColumn(data_prefix="middle", verbose_name=_("Middle Severity"), empty_values=())
     high_stats = StatsColumn(data_prefix="high", verbose_name=_("High Severity"), empty_values=())
+    actions = ActionsColumn(actions=("delete",))
 
     class Meta(NetBoxTable.Meta):
         model = models.ComplianceReport
@@ -165,7 +167,6 @@ class Meta(NetBoxTable.Meta):
             "high_stats",
             "created",
         )
-        exclude = ("actions",)
         default_columns = fields
 
 

diff --git a/validity/templates/validity/compliancereport.html b/validity/templates/validity/compliancereport.html
@@ -1,9 +1,15 @@
 {% extends 'generic/object.html' %}
 {% load validity %}
 {% load bootstrap5 %}
+{% load buttons %}
+{% load perms %}
 {% load render_table from django_tables2 %}
 {% block controls %}
-<div class="controls"></div>
+<div class="controls">
+{% if request.user|can_delete:object %}
+  {% delete_button object %}
+{% endif %}
+</div>
 {% endblock %}
 {% block content %}
   <div class="row">

diff --git a/validity/tests/test_views.py b/validity/tests/test_views.py
@@ -61,8 +61,8 @@ class TestDSNameSet(ViewTest):
 class TestReport(ViewTest):
     factory_class = ReportFactory
     model_class = models.ComplianceReport
-    get_suffixes = ["", "list"]
-    post_suffixes = []
+    get_suffixes = ["", "list", "delete"]
+    post_suffixes = ["delete"]
     post_body = {}
 
 

diff --git a/validity/views/report.py b/validity/views/report.py
@@ -110,3 +110,8 @@ class ReportResultView(TestResultBaseView):
     read_only = True
     exclude_form_fields = ("latest", "selector_id", "platform_id", "tenant_id", "device_role_id", "manufacturer_id")
     permission_required = "view_compliancereport"
+
+
+@register_model_view(models.ComplianceReport, "delete")
+class ReportDeleteView(generic.ObjectDeleteView):
+    queryset = models.ComplianceReport.objects.all()