Fix "Overdue" tag still visible with closed issues (#9539)

DefectDojo · Feb 13, 2024 · d91eab7 · d91eab7
1 parent 48afd9d
commit d91eab7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dojo/templates/dojo/engagement.html b/dojo/templates/dojo/engagement.html
@@ -151,7 +151,7 @@ <h3 class="has-filters">
                                     </div>
                                 </td>
                                 <td> {{ e.target_start }} - {{ e.target_end }}
-                                     {% if e.is_overdue %}
+                                     {% if e.is_overdue and e.status != 'Completed' %}
                                         <span class="tag-label warning-color">
                                              {{ e.target_end|overdue }} overdue
                                          </span>

diff --git a/dojo/templates/dojo/engagements_all.html b/dojo/templates/dojo/engagements_all.html
@@ -141,7 +141,7 @@ <h3 class="has-filters">
                                     {% endif %}
                                     <td> {{ e.status }} </td>
                                     <td> {{ e.target_start }} - {{ e.target_end }}
-                                        {% if e.is_overdue and e.active %}
+                                        {% if e.is_overdue and e.active and e.status != 'Completed' %}
                                         <sup><div class="tag-label warning-color">{{ e.target_end|overdue }} overdue</div></sup>
                                         {% endif %}
                                     </td>

diff --git a/dojo/templates/dojo/snippets/engagement_list.html b/dojo/templates/dojo/snippets/engagement_list.html
@@ -179,7 +179,7 @@ <h4> {% if status == "open" %}Active{% elif status == "paused" %}Paused {% else
                     </td>
                     <td class="text-left" class="nowrap">{{ eng.target_start|datediff_time:eng.target_end }}
                       {% if status == "open" %}
-                        {% if eng.is_overdue %}
+                        {% if eng.is_overdue and eng.status != 'Completed' %}
                         <sup>
                           <div class="tag-label warning-color">
                             {{ eng.target_end|overdue }} overdue