Merge pull request #291 from fasrc/cp_misc_changes

misc_fixes
fasrc · May 23, 2024 · 96373b2 · 96373b2
2 parents 462912b + 4c5082a
commit 96373b2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/coldfront/core/allocation/templates/allocation/allocation_detail.html b/coldfront/core/allocation/templates/allocation/allocation_detail.html
@@ -111,7 +111,13 @@ <h3><i class="fas fa-list" aria-hidden="true"></i> Allocation Information</h3>
           </tr>
           <tr>
               <th scope="row" class="text-nowrap">Service Period:</th>
-              <td>1 Month</td>
+	      <td>
+                {% if "Storage" in allocation.get_parent_resource.resource_type.name %}
+		1 Month
+                {% else %}
+		Current Quarter
+                {% endif %}
+	      </td>
           </tr>
           {% if expense_code %}
             <tr>

diff --git a/coldfront/core/allocation/views.py b/coldfront/core/allocation/views.py
@@ -330,7 +330,7 @@ def post(self, request, *args, **kwargs):
                         'isilon': 'coldfront.plugins.isilon',
                         # 'lfs': 'coldfront.plugins.lustre',
                     }
-                    rtype = next((k for k in resources_plugins), None)
+                    rtype = next((k for k in resources_plugins if k in alloc_change_obj.allocation.get_parent_resource.name), None)
                     if not rtype:
                         err = ('non-isilon resource interactions are not automated '
                             'at this time. Please manually create the resource '
@@ -2039,7 +2039,7 @@ def post(self, request, *args, **kwargs):
                         'isilon': 'coldfront.plugins.isilon',
                         # 'lfs': 'coldfront.plugins.lustre',
                     }
-                    rtype = next((k for k in resources_plugins), None)
+                    rtype = next((k for k in resources_plugins if k in alloc_change_obj.allocation.get_parent_resource.name), None)
                     if not rtype:
                         err = ('You cannot auto-update non-isilon resources at this '
                             'time. Please manually update the resource before '

diff --git a/coldfront/plugins/ldap/utils.py b/coldfront/plugins/ldap/utils.py
@@ -354,7 +354,7 @@ def cleaned_membership_query(proj_membs_mans):
     if search_errors:
         logger.error('could not return members and manager for some groups: %s',
                         search_errors)
-    return proj_membs_mans, [search_errors]
+    return proj_membs_mans, search_errors
 
 def remove_inactive_disabled_managers(groupusercollections):
     """Remove groupusercollections with inactive managers"""