See CHANGELOG

XSEDE · Mar 31, 2022 · 271567b · 271567b
1 parent 24c9865
commit 271567b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+tag-2.4-20220331
+  - Enhance resources-sgci/v1.0.0 API to include TACC resources
+
 tag-2.4-20220310b
   - Missing CreationTime should be None and not 'none'
 

diff --git a/django_xsede_warehouse/warehouse_views/views.py b/django_xsede_warehouse/warehouse_views/views.py
@@ -171,10 +171,9 @@ class Resource_List_SGCI_Active_100(APIView):
     permission_classes = (IsAuthenticatedOrReadOnly,)
     renderer_classes = (JSONRenderer,TemplateHTMLRenderer,XMLRenderer,)
     def get(self, request, format=None):
-        objects = RDR_Active_Resources_V2(affiliation='XSEDE', allocated=False, type='SUB', result='OBJECTS')
-#         |
-#        objects = RDR_Active_Resources_V2(affiliation='TACC', allocated=False, type='SUB', result='OBJECTS')
-        serializer = SGCI_Resource_Serializer_100(objects, many=True)
+        objects_XSEDE = RDR_Active_Resources_V2(affiliation='XSEDE', allocated=False, type='SUB', result='OBJECTS')
+        objects_TACC = RDR_Active_Resources_V2(affiliation='TACC', allocated=False, type='SUB', result='OBJECTS')
+        serializer = SGCI_Resource_Serializer_100(objects_XSEDE | objects_TACC, many=True)
         response_obj = {'results': serializer.data}
         return MyAPIResponse(response_obj, template_name='warehouse_views/sgci_resources.html')