diff --git a/coldfront/core/project/templates/project/project_detail.html b/coldfront/core/project/templates/project/project_detail.html index 89c4e12e7..a25b39e09 100644 --- a/coldfront/core/project/templates/project/project_detail.html +++ b/coldfront/core/project/templates/project/project_detail.html @@ -244,6 +244,7 @@

Award Amount Grant Start Date Grant End Date + Status Actions @@ -256,6 +257,13 @@

{{ grant.total_amount_awarded|intcomma}} {{ grant.grant_start|date:"Y-m-d" }} {{ grant.grant_end|date:"Y-m-d" }} + {% if grant.status.name == 'Active' %} + {{ grant.status.name }} + {% elif grant.status.name == 'Archived' %} + {{ grant.status.name }} + {% else %} + {{ grant.status.name }} + {% endif %} Edit {% endfor %} diff --git a/coldfront/core/project/views.py b/coldfront/core/project/views.py index cb2ef06df..f14a89bed 100644 --- a/coldfront/core/project/views.py +++ b/coldfront/core/project/views.py @@ -126,7 +126,7 @@ def get_context_data(self, **kwargs): context['research_outputs'] = ResearchOutput.objects.filter( project=self.object).order_by('-created') context['grants'] = Grant.objects.filter( - project=self.object, status__name__in=['Active', 'Pending']) + project=self.object, status__name__in=['Active', 'Pending', 'Archived']) context['allocations'] = allocations context['project_users'] = project_users context['ALLOCATION_ENABLE_ALLOCATION_RENEWAL'] = ALLOCATION_ENABLE_ALLOCATION_RENEWAL