Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

misc_fixes #291

Merged
merged 1 commit into from
May 23, 2024
Merged

misc_fixes #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion coldfront/core/allocation/templates/allocation/allocation_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions coldfront/core/allocation/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,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 '
Expand Down Expand Up @@ -2033,7 +2033,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 '
Expand Down
2 changes: 1 addition & 1 deletion coldfront/plugins/ldap/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,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"""
Expand Down
Loading