Merge pull request #1243 from girder/guard-acl-migration

Better guards on ACL migration
girder · Jul 24, 2023 · 28b835f · 28b835f
2 parents 865f100 + f7d40a0
commit 28b835f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Bug Fixes
 - The nd2 reader throws a different exception with JP2 files ([#1242](../../pull/1242))
+- Better guards on ACL migration ([#1243](../../pull/1243))
 
 ## 1.23.1
 

diff --git a/girder_annotation/girder_large_image_annotation/models/annotation.py b/girder_annotation/girder_large_image_annotation/models/annotation.py
@@ -764,7 +764,7 @@ def _migrateACL(self, annotation):
 
         self.copyAccessPolicies(item, annotation, save=False)
         self.setUserAccess(annotation, user, AccessType.ADMIN, force=True, save=False)
-        self.setPublic(annotation, folder.get('public'), save=False)
+        self.setPublic(annotation, folder.get('public') or False, save=False)
 
         # call the super class save method to avoid messing with elements
         super().save(annotation)