girder-large-image-annotation 1.35.7.dev4__tar.gz → 1.35.7.dev8__tar.gz

{girder_large_image_annotation-1.35.7.dev4/girder_large_image_annotation.egg-info → girder_large_image_annotation-1.35.7.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-large-image-annotation
-Version: 1.35.7.dev4
+Version: 1.35.7.dev8
 Summary: A Girder plugin to store and display annotations on large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,7 +19,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: jsonschema>=2.5.1
-Requires-Dist: girder-large-image>=1.35.7.dev4
+Requires-Dist: girder-large-image>=1.35.7.dev8
 Requires-Dist: orjson
 Provides-Extra: compute
 Requires-Dist: openpyxl; extra == "compute"
@@ -27,7 +27,7 @@ Requires-Dist: pandas>=2.2; extra == "compute"
 Requires-Dist: python-calamine; extra == "compute"
 Requires-Dist: umap-learn; extra == "compute"
 Provides-Extra: tasks
-Requires-Dist: girder-large-image[tasks]>=1.35.7.dev4; extra == "tasks"
+Requires-Dist: girder-large-image[tasks]>=1.35.7.dev8; extra == "tasks"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{girder_large_image_annotation-1.35.7.dev4 → girder_large_image_annotation-1.35.7.dev8}/girder_large_image_annotation/models/annotation.py

@@ -733,7 +733,9 @@ class Annotation(AccessControlledModel):
         destItemId = destItem['_id']
         folder = Folder().load(destItem['folderId'], force=True)
         count = 0
-        user = None
+        # The creator of the copied item is the user who copied it
+        user = User().load(destItem['creatorId'], force=True) if destItem.get(
+            'creatorId') else None
         for annotation in annotations:
             logger.info('Copying annotation %d of %d from %s to %s',
                         count + 1, total, srcItemId, destItemId)
@@ -745,13 +747,13 @@ class Annotation(AccessControlledModel):
                 continue
             annotation['itemId'] = destItemId
             del annotation['_id']
-            # Remove existing permissions, then give it the same permissions
-            # as the item's folder.
-            annotation.pop('access', None)
-            self.copyAccessPolicies(destItem, annotation, save=False)
+            # Replace existing permissions with the same permissions as the
+            # destination folder, as if the annotation was created there.
+            # Always have an ACL, even if the folder somehow lacks one.
+            annotation['access'] = {'users': [], 'groups': []}
+            self.copyAccessPolicies(folder, annotation, save=False)
             self.setPublic(annotation, folder.get('public') or False, save=False)
-            if user is None:
-                user = User().load(folder['creatorId'], force=True)
+            # Give the user who copied the item admin access
             if user is not None:
                 self.setUserAccess(annotation, user, AccessType.ADMIN, force=True, save=False)
             self.save(annotation)

{girder_large_image_annotation-1.35.7.dev4 → girder_large_image_annotation-1.35.7.dev8/girder_large_image_annotation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-large-image-annotation
-Version: 1.35.7.dev4
+Version: 1.35.7.dev8
 Summary: A Girder plugin to store and display annotations on large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,7 +19,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: jsonschema>=2.5.1
-Requires-Dist: girder-large-image>=1.35.7.dev4
+Requires-Dist: girder-large-image>=1.35.7.dev8
 Requires-Dist: orjson
 Provides-Extra: compute
 Requires-Dist: openpyxl; extra == "compute"
@@ -27,7 +27,7 @@ Requires-Dist: pandas>=2.2; extra == "compute"
 Requires-Dist: python-calamine; extra == "compute"
 Requires-Dist: umap-learn; extra == "compute"
 Provides-Extra: tasks
-Requires-Dist: girder-large-image[tasks]>=1.35.7.dev4; extra == "tasks"
+Requires-Dist: girder-large-image[tasks]>=1.35.7.dev8; extra == "tasks"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{girder_large_image_annotation-1.35.7.dev4 → girder_large_image_annotation-1.35.7.dev8}/girder_large_image_annotation.egg-info/requires.txt

@@ -1,5 +1,5 @@
 jsonschema>=2.5.1
-girder-large-image>=1.35.7.dev4
+girder-large-image>=1.35.7.dev8
 orjson
 
 [compute]
@@ -9,4 +9,4 @@ python-calamine
 umap-learn
 
 [tasks]
-girder-large-image[tasks]>=1.35.7.dev4
+girder-large-image[tasks]>=1.35.7.dev8

{girder_large_image_annotation-1.35.7.dev4 → girder_large_image_annotation-1.35.7.dev8}/test_annotation/test_annotations_rest.py

@@ -22,6 +22,7 @@ try:
     from girder.models.folder import Folder
     from girder.models.item import Item
     from girder.models.setting import Setting
+    from girder.models.user import User
 except ImportError:
     # Make it easier to test without girder
     pass
@@ -631,6 +632,33 @@ class TestLargeImageAnnotationRest:
         assert utilities.respStatus(resp) == 200
         assert len(resp.json) == 1
 
+    def testAnnotationAccessAfterCopyItem(self, server, user, admin):
+        other = User().createUser(
+            'other', 'password', 'Other', 'User', 'other@girder.test')
+        # A private folder created by the admin that the user can write to
+        # and another user can read
+        destFolder = Folder().createFolder(
+            utilities.namedFolder(admin, 'Private'), 'Shared', creator=admin)
+        Folder().setUserAccess(destFolder, user, AccessType.WRITE, save=True)
+        Folder().setUserAccess(destFolder, other, AccessType.READ, save=True)
+        item = Item().createItem('sample', user, utilities.namedFolder(user, 'Private'))
+        Annotation().createAnnotation(item, user, sampleAnnotation)
+        resp = server.request(
+            '/item/%s/copy' % item['_id'], method='POST', user=user,
+            params={'folderId': str(destFolder['_id'])})
+        assert utilities.respStatus(resp) == 200
+        newItemId = resp.json['_id']
+        # The user who copied the item has admin access to the copied
+        # annotation and the other user has the destination folder's access
+        for checkUser, level in ((user, AccessType.ADMIN), (other, AccessType.READ)):
+            resp = server.request(
+                '/annotation', user=checkUser, params={'itemId': newItemId})
+            assert utilities.respStatus(resp) == 200
+            assert len(resp.json) == 1
+            resp = server.request('/annotation/%s' % resp.json[0]['_id'], user=checkUser)
+            assert utilities.respStatus(resp) == 200
+            assert resp.json['_accessLevel'] == level
+
 
 @pytest.mark.plugin('large_image_annotation')
 class TestLargeImageAnnotationElementGroups: