moar template fix

fasrc · Nov 16, 2023 · c31fc45 · c31fc45
1 parent 504bd0e
commit c31fc45
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/coldfront/core/allocation/templates/allocation/allocation_detail.html b/coldfront/core/allocation/templates/allocation/allocation_detail.html
@@ -465,7 +465,7 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Users in Al
           {% for user in allocation_users %}
             {% if user.unit == "CPU Hours" %}
               {% firstof user.usage as userusage %}
-              {% firstof allocation.usage as allocationusage %}
+              {% firstof allocation.size as allocationusage %}
             {% else %}
               {% firstof user.usage_bytes as userusage %}
               {% firstof allocation.usage_exact as allocationusage %}
@@ -490,20 +490,14 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Users in Al
               {% if allocationusage == None or allocationusage == 0 %}
                 <td>0</td>
               {% else %}
-                {% if user.unit == "CPU Hours" %}
-                  <td>{{userusage|div:allocation.size|mul:100|floatformat:2 }}%</td>
-                {% else %}
                   <td>{{userusage|div:allocationusage|mul:100|floatformat:2 }}%</td>
-                {% endif %}
-
               {% endif %}
-              {% if user.unit == "CPU Hours" %}
-                {% cost_cpuhours userusage as cost %}
-              {% else %}
+
+              {% if user.unit != "CPU Hours" %}
                 {% cost_bytes userusage as cost %}
-              {% endif %}
-              {% if cost %}
-                <td>{{ cost }}</td>
+                {% if cost %}
+                  <td>{{ cost }}</td>
+                {% endif %}
               {% endif %}
             </tr>
           {% endfor %}