Merge "Added delete button to the single_report page to delete report from DB"
diff --git a/testrail_bot/control/templates/control/report.html b/testrail_bot/control/templates/control/report.html
index b4766cd..bbe8b01 100644
--- a/testrail_bot/control/templates/control/report.html
+++ b/testrail_bot/control/templates/control/report.html
@@ -40,5 +40,16 @@
};
window.onload = function() {send()};</script>
+<a href="{% url 'delete_report' report_id %}">
+ <button class="btn btn-danger m-1">
+ <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1em"
+ height="1em" viewBox="0,0,256,256">
+ <g fill="#ffffff" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><g transform="scale(10.66667,10.66667)">
+ <path d="M10,2l-1,1h-4c-0.6,0 -1,0.4 -1,1c0,0.6 0.4,1 1,1h2h10h2c0.6,0 1,-0.4 1,-1c0,-0.6 -0.4,-1 -1,-1h-4l-1,-1zM5,7v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2v-13zM9,9c0.6,0 1,0.4 1,1v9c0,0.6 -0.4,1 -1,1c-0.6,0 -1,-0.4 -1,-1v-9c0,-0.6 0.4,-1 1,-1zM15,9c0.6,0 1,0.4 1,1v9c0,0.6 -0.4,1 -1,1c-0.6,0 -1,-0.4 -1,-1v-9c0,-0.6 0.4,-1 1,-1z"></path></g></g>
+ </svg>
+ Delete
+ </button>
+</a>
+
<pre id="data" class="p-4 border">{{ report | safe }}</pre>
{% endblock %}
\ No newline at end of file
diff --git a/testrail_bot/control/templates/control/reports.html b/testrail_bot/control/templates/control/reports.html
index 5f01037..337349b 100644
--- a/testrail_bot/control/templates/control/reports.html
+++ b/testrail_bot/control/templates/control/reports.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% block section %}
-<p>Reports:</p>
+<p>Reports (total {{ reports|length }}):</p>
<div class="list-group">
{% for report in reports %}
<a href="{% url 'single_report' report.id %}" class="list-group-item
diff --git a/testrail_bot/control/urls.py b/testrail_bot/control/urls.py
index b5292f3..6592132 100644
--- a/testrail_bot/control/urls.py
+++ b/testrail_bot/control/urls.py
@@ -10,6 +10,8 @@
path("runs/<int:run_id>/delete/", views.delete_run, name="delete_run"),
path("reports/", views.list_reports, name="list_reports"),
path("reports/<int:report_id>/", views.single_report, name="single_report"),
+ path("reports/<int:report_id>/delete", views.delete_report,
+ name="delete_report"),
path('index/', views.index, name='index'),
path("help/", views.show_help, name="help"),
path("update_jenkins_plot",
diff --git a/testrail_bot/control/views.py b/testrail_bot/control/views.py
index f7b0a9d..0ebdf41 100644
--- a/testrail_bot/control/views.py
+++ b/testrail_bot/control/views.py
@@ -69,6 +69,16 @@
"finished": report.finished})
+def delete_report(request, report_id):
+ report:models.TestRailReport = models.TestRailReport.objects.get(pk=report_id)
+ try:
+ os.remove(report.path.path)
+ except FileNotFoundError:
+ pass
+ report.delete()
+ return redirect("list_reports")
+
+
def submit_run(request, run_id):
run = models.TestRailTestRun.objects.get(pk=run_id)
is_testplan = test_rail_api.is_testplan(run.run_id)