Merge branch 'feature/s3-improvements' into s3-improvement-migration

CenterForOpenScience · Jul 26, 2023 · e8a6e03 · e8a6e03
2 parents 1425d1f + 132d7ff
commit e8a6e03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/addons/serializers.py b/api/addons/serializers.py
@@ -32,8 +32,8 @@ def get_absolute_url(self, obj):
             kwargs=self.context['request'].parser_context['kwargs'],
             query_kwargs={
                 'path': obj['path'],
-                'id': obj['id'],
-            },
+                'id': obj['id']
+            }
         )
 
     def get_root_folder(self, obj):

diff --git a/api_tests/nodes/views/test_node_addons.py b/api_tests/nodes/views/test_node_addons.py
@@ -805,7 +805,7 @@ def test_folder_list_GET_expected_behavior(self, mock_libraries):
                 'fileEditing': 'members',
                 'libraryEditing': 'members',
                 'type': 'Private',
-                'id': '18497322',
+                'id': 18497322,
                 'name': 'Group Library I'
             },
             'version': 1,