diff --git a/evidence/templates/ev_details.html b/evidence/templates/ev_details.html index 1603696..fe0605f 100644 --- a/evidence/templates/ev_details.html +++ b/evidence/templates/ev_details.html @@ -1,5 +1,13 @@ {% extends "base.html" %} {% load i18n %} +{% block actions %} + + + + {% trans "Download File" %} + + +{% endblock %} {% block content %}
@@ -8,20 +16,57 @@
+{% load django_bootstrap5 %} +
+ {% csrf_token %} + + {% if form2.errors %} + + {% endif %} + + +
+ + + +
+ + +
+
@@ -35,13 +80,13 @@ - {% trans "Type" %} + {% trans "Algorithm" %} - {% trans "Identificator" %} + {% trans "Device ID" %} - {% trans "Data" %} + {% trans "Date" %} @@ -53,7 +98,8 @@ - {{ snap.value }} + {{ snap.value|truncatechars:7|upper }} + {{ dev.shortid }} @@ -67,6 +113,7 @@
+
{% load django_bootstrap5 %}
@@ -88,7 +135,7 @@
{% translate "Cancel" %} - +
{% if form.tag.value %}
@@ -101,6 +148,7 @@
+ {% endblock %} {% block extrascript %} diff --git a/evidence/templates/ev_eraseserver.html b/evidence/templates/ev_eraseserver.html deleted file mode 100644 index db7faaf..0000000 --- a/evidence/templates/ev_eraseserver.html +++ /dev/null @@ -1,61 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-
-

{{ object.id }}

-
-
- -
-
- -
-
-
- -
- - {% load django_bootstrap5 %} -
-
- {% csrf_token %} - {% if form.errors %} - - {% endif %} - {% bootstrap_form form %} -
-
-
- {% translate "Cancel" %} - -
-
-
-
-
-
-
-{% endblock %} diff --git a/evidence/urls.py b/evidence/urls.py index c8eea40..e1cf821 100644 --- a/evidence/urls.py +++ b/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("", views.EvidenceView.as_view(), name="details"), - path("/eraseserver", views.EraseServerView.as_view(), name="erase_server"), path("/download", views.DownloadEvidenceView.as_view(), name="download"), path("tag//delete", views.DeleteEvidenceTagView.as_view(), name="delete_tag"), ] diff --git a/evidence/views.py b/evidence/views.py index 933ab7d..c2a1b01 100644 --- a/evidence/views.py +++ b/evidence/views.py @@ -103,6 +103,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 @@ -113,6 +114,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) @@ -142,51 +160,6 @@ class DownloadEvidenceView(DashboardView, TemplateView): return response -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_properties() - 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 - - class DeleteEvidenceTagView(DashboardView, DeleteView): model = SystemProperty @@ -197,14 +170,14 @@ class DeleteEvidenceTagView(DashboardView, DeleteView): def get(self, request, *args, **kwargs): self.object = self.get_object() - message = _(" Evidence Tag: {}").format(self.object.value) + message = _(" Evidence Tag: {}").format(self.object.value) DeviceLog.objects.create( snapshot_uuid=self.object.uuid, event=message, user=self.request.user, institution=self.request.user.institution ) - self.object.delete() + self.object.delete() messages.info(self.request, _("Evicende Tag deleted successfully.")) return self.handle_success() @@ -214,6 +187,6 @@ class DeleteEvidenceTagView(DashboardView, DeleteView): def get_success_url(self): return self.request.META.get( - 'HTTP_REFERER', + 'HTTP_REFERER', reverse_lazy('evidence:details', args=[self.object.uuid]) )