update ProjectDetail user table actions display, allocation cost calc…

…ulation
fasrc · Aug 21, 2024 · 4f6be66 · 4f6be66
1 parent 535705f
commit 4f6be66
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/coldfront/core/allocation/models.py b/coldfront/core/allocation/models.py
@@ -273,9 +273,10 @@ def cost(self):
         size_attr_name = self._return_size_attr_name()
         if not size_attr_name:
             return None
-        size = self.allocationattribute_set.get(
-                    allocation_attribute_type__name=size_attr_name).value
-        return 0 if not size else price * float(size)
+        size = self.allocationattribute_set.filter(
+                    allocation_attribute_type__name=size_attr_name)
+        size_value = None if not size else size.first().value
+        return 0 if not size_value else price * float(size_value)
 
     @property
     def expires_in(self):

diff --git a/coldfront/core/project/templates/project/project_detail.html b/coldfront/core/project/templates/project/project_detail.html
@@ -334,7 +334,9 @@ <h3 class="d-inline" id="users"><i class="fas fa-users" aria-hidden="true"></i>
                  <i class="fas fa-info-circle" aria-hidden="true"></i>
                </a>
             </th>
-            <th scope="col">Actions</th>
+            {% if is_allowed_to_update_permissions %}
+              <th scope="col">Actions</th>
+            {% endif %}
           </tr>
         </thead>
         <tbody>
@@ -347,8 +349,8 @@ <h3 class="d-inline" id="users"><i class="fas fa-users" aria-hidden="true"></i>
               <td>{{ user.user.first_name }} {{ user.user.last_name }}</td>
               <td>{{ user.user.email }}</td>
               <td>{{ user.role.name }}</td>
-              <td>
-                {% if is_allowed_to_update_permissions %}
+              {% if is_allowed_to_update_permissions %}
+                <td>
                   <input type="checkbox"
                   id="email_notifications_for_user_id_{{user.id}}"
                   name="email_notifications_checkbox"
@@ -368,8 +370,8 @@ <h3 class="d-inline" id="users"><i class="fas fa-users" aria-hidden="true"></i>
                   value="{{ user.enable_notifications }}"
                   {% if user.enable_notifications %} checked {% endif %}
                   disabled>
-                {% endif %}
-              </td>
+                </td>
+              {% endif %}
               <td>
                 {% if is_allowed_to_update_permissions and user != project.pi %}
                   <a href="{% url 'project-user-detail' project.pk user.id %}"><i class="fas fa-user-edit" aria-hidden="true"></i><span class="sr-only">Edit</span></a>