|
{{ snap.key }}
|
- {{ snap.value }}
+ {{ snap.value|truncatechars:7|upper }}
+ {{ dev.shortid }}
|
@@ -69,6 +116,7 @@
+
{% load django_bootstrap5 %}
@@ -90,7 +138,7 @@
{% if form.tag.value %}
@@ -103,6 +151,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 %}
-
-
-
-
-
-
-
- {% load django_bootstrap5 %}
-
-
-
-{% endblock %}
diff --git a/evidence/urls.py b/evidence/urls.py
index 9a4e2a2..87ccdd5 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('annotation//del', views.AnnotationDeleteView.as_view(), name='delete_annotation'),
]
diff --git a/evidence/views.py b/evidence/views.py
index c2868b2..f38ee7e 100644
--- a/evidence/views.py
+++ b/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
|