Merge pull request #325 from fasrc/development

Development
fasrc · Aug 21, 2024 · a712792 · a712792
2 parents ad0fa54 + bf86ede
commit a712792
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/coldfront/core/resource/management/commands/add_resource_defaults.py b/coldfront/core/resource/management/commands/add_resource_defaults.py
@@ -114,7 +114,7 @@ def handle(self, *args, **options):
                 defaults={'value': default_value}
             )
 
-            quantity_label = "Quantity in TB"
+            quantity_label = "TB"
             if default_value == 20:
                 quantity_label += " in 20T increments"
 

diff --git a/coldfront/plugins/api/serializers.py b/coldfront/plugins/api/serializers.py
@@ -99,7 +99,7 @@ class Meta:
 
 class AllocationRequestSerializer(serializers.ModelSerializer):
     project = serializers.SlugRelatedField(slug_field='title', read_only=True)
-    resource = serializers.SlugRelatedField(slug_field='name', read_only=True)
+    resource = serializers.ReadOnlyField(source='get_resources_as_string', read_only=True)
     status = serializers.SlugRelatedField(slug_field='name', read_only=True)
     fulfilled_date = serializers.DateTimeField(read_only=True)
     created_by = serializers.SerializerMethodField(read_only=True)

diff --git a/coldfront/plugins/fasrc/management/commands/pull_resource_data.py b/coldfront/plugins/fasrc/management/commands/pull_resource_data.py
@@ -86,6 +86,6 @@ def handle(self, *args, **options):
                 try:
                     volume = [v for v in volumes if v['name'] == resource_name][0]
                 except:
-                    logger.error('resource not found in starfish: %s', resource)
+                    logger.debug('resource not found in starfish: %s', resource)
                     continue
                 update_resource_attr_types_from_dict(resource, volume['attrs'])
diff --git a/coldfront/plugins/fasrc/utils.py b/coldfront/plugins/fasrc/utils.py
@@ -137,9 +137,9 @@ def _standardize_nesefile(self):
             translator = dict((
                 kv.split('=') for kv in (l.strip('\n') for l in groupkey_file)
             ))
-        headers_df = pd.read_csv(header_file, header=0, delim_whitespace=True)
+        headers_df = pd.read_csv(header_file, header=0, sep='\s+')
         headers = headers_df.columns.values.tolist()
-        data = pd.read_csv(datafile, names=headers, delim_whitespace=True)
+        data = pd.read_csv(datafile, names=headers, sep='\s+')
         data = data.loc[data['pool'].str.contains('1')]
         data['lab'] = data['pool'].str.replace('1', '').str.replace('hugl', '').str.replace('hus3', '')
         data['server'] = 'nesetape'

diff --git a/coldfront/plugins/ldap/utils.py b/coldfront/plugins/ldap/utils.py
@@ -668,6 +668,7 @@ def identify_ad_group(sender, **kwargs):
         ad_conn = LDAPConn()
         members, manager = ad_conn.return_group_members_manager(project_title)
     except Exception as e:
+        logger.exception(e)
         raise ValueError(f"ldap connection error: {e}")
     try:
         ifx_pi = get_user_model().objects.get(username=manager['sAMAccountName'][0])

diff --git a/coldfront/plugins/sftocf/utils.py b/coldfront/plugins/sftocf/utils.py
@@ -601,6 +601,7 @@ def allocations(self):
             status__name__in=allocation_statuses,
             resources__in=self.connection_obj.get_corresponding_coldfront_resources()
         )
+        return self._allocations
 
     @property
     def allocationquerymatches(self):