Skip to content

Commit

Permalink
This commit solves issue ubccr#193 and shows slurm_attrib/description
Browse files Browse the repository at this point in the history
  • Loading branch information
bhatiadheeraj committed Oct 29, 2020
1 parent 91ae1d9 commit 29c1b0e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion coldfront/core/project/templates/project/project_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ <h3 class="d-inline"><i class="fas fa-server" aria-hidden="true"></i> Allocation
<tr>
<th scope="col">Resource Name</th>
<th scope="col">Resource Type</th>
<th scope="col">Information</th>
<th scope="col">Description</th>
<th scope="col">Status</th>
<th scope="col">End Date</th>
<th scope="col" class="nosort">Actions</th>
Expand All @@ -181,7 +181,11 @@ <h3 class="d-inline"><i class="fas fa-server" aria-hidden="true"></i> Allocation
<tr>
<td>{{ allocation.get_parent_resource.name }}</td>
<td>{{ allocation.get_parent_resource.resource_type.name }}</td>
{% if allocation.description != None %}
<td class="text-nowrap">{{allocation.description}}</td>
{% else %}
<td class="text-nowrap">{{allocation.get_information}}</td>
{% endif %}
{% if allocation.status.name == 'Active' %}
<td class="text-success">{{ allocation.status.name }}</td>
{% elif allocation.status.name == 'Expired' or allocation.status.name == 'Denied' %}
Expand Down

0 comments on commit 29c1b0e

Please sign in to comment.