Merge "[testrail-bot]Add button to delete run"
diff --git a/testrail_bot/control/templates/control/create_run.html b/testrail_bot/control/templates/control/create_run.html
index 5b72402..ba25508 100644
--- a/testrail_bot/control/templates/control/create_run.html
+++ b/testrail_bot/control/templates/control/create_run.html
@@ -26,7 +26,12 @@
{% buttons %}
<div class="btn-toolbar col-xs-7">
<button type="submit" class="btn btn-primary">
- {% bootstrap_icon "star" %} Save
+ <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1em"
+ height="1em" viewBox="0,0,256,256">
+ <g fill="#fffafa" 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="M6,2c-0.13812,0 -0.27212,0.01438 -0.40234,0.04102c-0.91157,0.18642 -1.59766,0.99211 -1.59766,1.95898v18l8,-3l8,3v-18c0,-0.1375 -0.01426,-0.27246 -0.04102,-0.40234c-0.15978,-0.78135 -0.77529,-1.39686 -1.55664,-1.55664c-0.13022,-0.02663 -0.26422,-0.04102 -0.40234,-0.04102z"></path></g></g>
+ </svg>
+ Save
</button>
</div>
{% endbuttons %}
diff --git a/testrail_bot/control/templates/control/update_run.html b/testrail_bot/control/templates/control/update_run.html
index 3efd2f5..60d615a 100644
--- a/testrail_bot/control/templates/control/update_run.html
+++ b/testrail_bot/control/templates/control/update_run.html
@@ -29,7 +29,12 @@
{% buttons %}
<div class="btn-toolbar col-xs-7">
<button type="submit" class="btn btn-primary">
- {% bootstrap_icon "star" %} Save
+ <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="1em"
+ height="1em" viewBox="0,0,256,256">
+ <g fill="#fffafa" 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="M6,2c-0.13812,0 -0.27212,0.01438 -0.40234,0.04102c-0.91157,0.18642 -1.59766,0.99211 -1.59766,1.95898v18l8,-3l8,3v-18c0,-0.1375 -0.01426,-0.27246 -0.04102,-0.40234c-0.15978,-0.78135 -0.77529,-1.39686 -1.55664,-1.55664c-0.13022,-0.02663 -0.26422,-0.04102 -0.40234,-0.04102z"></path></g></g>
+ </svg>
+ Save
</button>
<button type="submit" formaction="{% url 'submit_run' run_id %}" class="btn btn-primary">
<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-chevron-double-right" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -38,6 +43,15 @@
</svg>
Submit
</button>
+ <button type="submit" formaction="{% url 'delete_run' run_id %}"
+ class="btn btn-danger">
+ <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>
</div>
{% endbuttons %}
</form>
diff --git a/testrail_bot/control/urls.py b/testrail_bot/control/urls.py
index 0807794..fd8bebc 100644
--- a/testrail_bot/control/urls.py
+++ b/testrail_bot/control/urls.py
@@ -7,6 +7,7 @@
path("runs/", views.create_run, name="create_run"),
path("runs/<int:run_id>/", views.single_run, name="single_run"),
path("runs/<int:run_id>/submit/", views.submit_run, name="submit_run"),
+ 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('index/', views.index, name='index'),
diff --git a/testrail_bot/control/views.py b/testrail_bot/control/views.py
index 7c94a25..bc052a1 100644
--- a/testrail_bot/control/views.py
+++ b/testrail_bot/control/views.py
@@ -89,6 +89,12 @@
return redirect("single_report", report.id)
+def delete_run(request, run_id):
+ run = models.TestRailTestRun.objects.get(pk=run_id)
+ run.delete()
+ return redirect("index")
+
+
def show_help(request):
return render(request, "control/help.html")