moved both forms to single evidence details view

evidence/templates/ev_details.html

@@ -1,5 +1,13 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% block actions %}
+        <a href="{% url 'evidence:download' object.uuid %}" class="btn btn-green-admin">
+          <i class="bi bi-file-earmark-arrow-down"></i>
+          {% trans "Download File" %}
+        </a>
+
+
+{% endblock %}
 
 {% block content %}
 <div class="row">
@@ -8,20 +16,57 @@
   </div>
 </div>
 
+{% load django_bootstrap5 %}
+<form role="form" method="post" class="p-2 mb-4 border rounded shadow-sm d-flex d-inline-flex align-items-center gap-3" style="max-width: 400px; {% if form2.erase_server.value %}background-color: #d5f7de;{% else %}background-color: #f7e7d5;{% endif %}">
+  {% csrf_token %}
+
+  {% if form2.errors %}
+    <div class="alert alert-danger d-flex align-items-center alert-dismissible fade show w-100" role="alert">
+      <i class="mdi mdi-alert-circle me-2"></i>
+      <div>
+        {% for field, error in form2.errors.items %}
+          <strong>{{ field|title }}:</strong> {{ error }}<br />
+        {% endfor %}
+      </div>
+      <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+    </div>
+  {% endif %}
+
+  <!-- erase server swithc -->
+<div class="form-check form-switch m-0">
+  <input
+    class="form-check-input"
+    type="checkbox"
+    id="{{ form2.erase_server.id_for_label }}"
+    name="{{ form2.erase_server.name }}"
+    {% if form2.erase_server.value %}
+      checked
+    {% endif %}>
+
+  <label class="form-check-label ps-1" for="{{ form2.erase_server.id_for_label }}">
+    {% if form2.erase_server.value %}
+       <i class="pe-1 bi bi-eraser"></i>
+      {% translate "It is an erase server" %}
+    {% else %}
+       <i class="pe-1 bi bi-x-circle"></i>
+      {% translate "It is not an erase server" %}
+    {% endif %}
+  </label>
+</div>
+  <!-- submit button -->
+  <button class="btn btn-sm btn btn-outline-success" d-flex align-items-end gap-1" type="submit" name="submit_form2">
+    <i class="bi bi-floppy2-fill"></i> {% translate 'Save' %}
+  </button>
+</form>
+
 <div class="row">
   <div class="col">
     <ul class="nav nav-tabs nav-tabs-bordered">
       <li class="nav-items">
-        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#device">{% trans "Devices" %}</button>
+        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#device">{% trans "Device" %}</button>
       </li>
       <li class="nav-items">
-	<a href="#tag" class="nav-link" data-bs-toggle="tab" data-bs-target="#tag">{% trans "Tag" %}</a>
+	      <a href="#tag" class="nav-link" data-bs-toggle="tab" data-bs-target="#tag">{% trans "Tag" %}</a>
-      </li>
-      <li class="nav-items">
-        <a href="{% url 'evidence:erase_server' object.uuid %}" class="nav-link">{% trans "Erase Server" %}</a>
-      </li>
-      <li class="nav-items">
-        <a href="{% url 'evidence:download' object.uuid %}" class="nav-link">{% trans "Download File" %}</a>
       </li>
     </ul>
   </div>
@@ -35,26 +80,28 @@
         <thead>
           <tr>
             <th scope="col" data-sortable="">
-              {% trans "Type" %}
+              {% trans "Algorithm" %}
             </th>
             <th scope="col" data-sortable="">
-              {% trans "Identificator" %}
+              {% trans "Device ID" %}
             </th>
             <th scope="col" data-sortable="">
-              {% trans "Data" %}
+              {% trans "Date" %}
             </th>
           </tr>
         </thead>
         {% for snap in object.annotations %}
-        <tbody>
+
         {% if snap.type == 0 %}
+        <tbody>
           <tr>
             <td>
               {{ snap.key }}
             </td>
             <td>
               <small class="text-muted">
-                <a href="{% url 'device:details' snap.value %}">{{ snap.value }}</a>
+                <a href="{% url 'device:details' snap.value %}">{{  snap.value|truncatechars:7|upper }}</a>
+            {{ dev.shortid }}
               </small>
             </td>
             <td>
@@ -69,6 +116,7 @@
       </table>
     </div>
   </div>
+
   <div class="tab-pane fade" id="tag">
     {% load django_bootstrap5 %}
     <div class="list-group col-6">
@@ -90,7 +138,7 @@
 	  <div class="row">
 	    <div class="col">
               <a class="btn btn-grey" href="">{% translate "Cancel" %}</a>
-              <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
+              <input class="btn btn-green-admin" type="submit" name="submit_form1" value="{% translate 'Save' %}" />
 	    </div>
 	    {% if form.tag.value %}
 	    <div class="col-1">
@@ -103,6 +151,7 @@
     </div>
   </div>
 </div>
+
 {% endblock %}
 
 {% block extrascript %}

evidence/templates/ev_eraseserver.html

@@ -1,61 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block content %}
-<div class="row">
-  <div class="col">
-    <h3>{{ object.id }}</h3>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col">
-    <ul class="nav nav-tabs nav-tabs-bordered">
-      <li class="nav-items">
-        <a href="{% url 'evidence:details' object.uuid %}" class="nav-link">{% trans "Devices" %}</a>
-      </li>
-      <li class="nav-items">
-        <a href="{% url 'evidence:details' object.uuid %}#tag" class="nav-link">{% trans "Tag" %}</a>
-      </li>
-      <li class="nav-items">
-        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#erase_server">{% trans "Erase Server" %}</button>
-      </li>
-      <li class="nav-items">
-        <a href="{% url 'evidence:download' object.uuid %}" class="nav-link">{% trans "Download File" %}</a>
-      </li>
-    </ul>
-  </div>
-</div>
-<div class="tab-content pt-2">
-
-  <div class="tab-pane fade show active" id="erase_server">
-
-    {% load django_bootstrap5 %}
-    <div class="list-group col-6">
-      <form role="form" method="post">
-        {% csrf_token %}
-        {% if form.errors %}
-        <div class="alert alert-danger alert-icon alert-icon-border alert-dismissible" role="alert">
-          <div class="icon"><span class="mdi mdi-close-circle-o"></span></div>
-          <div class="message">
-            {% for field, error in form.errors.items %}
-              {{ error }}<br />
-            {% endfor %}
-            <button class="btn-close" type="button" data-dismiss="alert" aria-label="Close"></button>
-          </div>
-        </div>
-        {% endif %}
-	{% bootstrap_form form %}
-        <div class="container">
-	  <div class="row">
-	    <div class="col">
-              <a class="btn btn-grey" href="">{% translate "Cancel" %}</a>
-              <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
-	    </div>
-	  </div>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
-{% endblock %}

evidence/urls.py

@@ -18,7 +18,6 @@ urlpatterns = [
     path("upload", views.UploadView.as_view(), name="upload"),
     path("import", views.ImportView.as_view(), name="import"),
     path("<uuid:pk>", views.EvidenceView.as_view(), name="details"),
-    path("<uuid:pk>/eraseserver", views.EraseServerView.as_view(), name="erase_server"),
     path("<uuid:pk>/download", views.DownloadEvidenceView.as_view(), name="download"),
     path('annotation/<int:pk>/del', views.AnnotationDeleteView.as_view(), name='delete_annotation'),
 ]

evidence/views.py

@@ -102,6 +102,7 @@ class EvidenceView(DashboardView, FormView):
         context = super().get_context_data(**kwargs)
         context.update({
             'object': self.object,
+            'form2': EraseServerForm(**self.get_form_kwargs(), data=self.request.POST or None),
         })
         return context
 
@@ -112,6 +113,23 @@ class EvidenceView(DashboardView, FormView):
         kwargs['user'] = self.request.user
         return kwargs
 
+    def post(self, request, *args, **kwargs):
+        form1 = self.get_form()
+        #Empty param @initial makes it work, but i doubt it is the correct logic
+        form2 = EraseServerForm(request.POST, user=self.request.user, initial={}, uuid=self.kwargs.get('pk'))
+
+        if "submit_form1" in request.POST and form1.is_valid():
+            return self.form_valid(form1)
+        elif "submit_form2" in request.POST and form2.is_valid():
+            return self.form2_valid(form2)
+
+        return self.form_invalid(form1, form2)
+
+    def form2_valid(self, form):
+        form.save(self.request.user)
+        response = super().form_valid(form)
+        return response
+
     def form_valid(self, form):
         form.save(self.request.user)
         response = super().form_valid(form)
@@ -166,48 +184,3 @@ class AnnotationDeleteView(DashboardView, DeleteView):
 
 
         return redirect(url_name, **kwargs_view)
-
-
-class EraseServerView(DashboardView, FormView):
-    template_name = "ev_eraseserver.html"
-    section = "evidences"
-    title = _("Evidences")
-    breadcrumb = "Evidences / Details"
-    success_url = reverse_lazy('evidence:list')
-    form_class = EraseServerForm
-
-    def get(self, request, *args, **kwargs):
-        self.pk = kwargs['pk']
-        self.object = Evidence(self.pk)
-        if self.object.owner != self.request.user.institution:
-            raise Http403
-
-        self.object.get_annotations()
-        return super().get(request, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context.update({
-            'object': self.object,
-        })
-        return context
-
-    def get_form_kwargs(self):
-        self.pk = self.kwargs.get('pk')
-        kwargs = super().get_form_kwargs()
-        kwargs['uuid'] = self.pk
-        kwargs['user'] = self.request.user
-        return kwargs
-
-    def form_valid(self, form):
-        form.save(self.request.user)
-        response = super().form_valid(form)
-        return response
-
-    def form_invalid(self, form):
-        response = super().form_invalid(form)
-        return response
-
-    def get_success_url(self):
-        success_url = reverse_lazy('evidence:details', args=[self.pk])
-        return success_url