{% if child_resources %}
-
-
-
-
- Resource Name |
- WarrantyExpire |
- ServiceEnd |
- Vendor |
- Serial # |
- Model |
-
-
-
- {% for child in child_resources %}
+ {% if child_resources.0.Acc %}
+
+
+ There are no child resources to display.
+
+ {% else %}
+
+
+
+
+ Resource Name |
+ WarrantyExpire |
+ ServiceEnd |
+ Vendor |
+ Serial # |
+ Model |
+
+
+
+ {% for child in child_resources %}
+ {% if child.Available %}
{{child.object}} |
{{child.WarrantyExpirationDate}} |
@@ -147,10 +154,12 @@ Child
{{child.SerialNumber}} |
{{child.Model}} |
- {% endfor %}
-
-
-
+ {% endif %}
+ {% endfor %}
+
+
+
+ {% endif %}
{% else %}
diff --git a/coldfront/core/resource/templates/resource_list.html b/coldfront/core/resource/templates/resource_list.html
index e547ca22f..733873ab1 100644
--- a/coldfront/core/resource/templates/resource_list.html
+++ b/coldfront/core/resource/templates/resource_list.html
@@ -66,14 +66,16 @@
Resources
{% for resource in resource_list %}
+
- {{ resource.id }} |
- {{ resource }} |
- {{ resource.parent_resource }} |
- {{ resource.resource_type.name }} |
+ {% if resource.is_available %}
+ {{ resource.id }} |
+ {{ resource }} |
+ {{ resource.parent_resource }} |
+ {{ resource.resource_type.name }} |
+
+ {% endif %}
- {% endfor %}
-
{% if is_paginated %} Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}