Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtesauro merged 1 commit into from
Feb 13, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dojo/templates/dojo/engagement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dojo/templates/dojo/engagements_all.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dojo/templates/dojo/snippets/engagement_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down