Merge branch 'SDC-938-cleanup-service' into 'master'

Sdc 938 cleanup service

See merge request !305

atdb/taskdatabase/templates/taskdatabase/failures/tasks.html

@@ -40,7 +40,7 @@
 
                 <td>
                     {% include "taskdatabase/failures/retry_buttons.html" %}
-                    <a href="{% url 'task-discard-view' task.pk 'discarded' my_tasks.number %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-trash-alt"></i> Discard</a>
+                    <a href="{% url 'task-discard-view' task.pk 'discard' my_tasks.number %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-trash-alt"></i> Discard</a>
                 </td>
 
                 </tr>

atdb/taskdatabase/templates/taskdatabase/query/set_multi_status_panel.html

@@ -20,7 +20,7 @@
                      <a href="{% url 'task-multi-setstatus' 'archived' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>&nbsp;
                      <a href="{% url 'task-multi-setstatus' 'finished' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>&nbsp;
                      <a href="{% url 'task-multi-setstatus' 'suspended' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> suspended</a>&nbsp;
-                     <a href="{% url 'task-multi-setstatus' 'discarded' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-trash-alt"></i> discard</a>
+                     <a href="{% url 'task-multi-setstatus' 'discard' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-trash-alt"></i> discard</a>
                     </tr>
                  </table>
                  {% endif %}

atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html

@@ -9,6 +9,7 @@
 <a href="{% url 'task-details-setstatus' task.pk 'archived' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>&nbsp;
 <a href="{% url 'task-details-setstatus' task.pk 'finished' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>&nbsp;
 <a href="{% url 'task-details-setstatus' task.pk 'suspended' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> suspended</a>&nbsp;
+
 <!--
 <a href="{% url 'task-details-setstatus' task.pk 'discard' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> discard</a>&nbsp;
 -->
\ No newline at end of file

atdb/taskdatabase/tests.py

@@ -367,4 +367,5 @@ class TestCalculatedQualities(TestCase):
                 pass
 
         self.assertEqual(quality_values, {'poor': 0, 'moderate': 0, 'good': 0})
-        self.assertEqual(quality_per_sasid, None)
+        self.assertEqual(quality_per_sasid, None)
\ No newline at end of file
+