Merge branch 'master' into aarav_edit

1 files changed, 5 insertions, 5 deletions

diff --git a/src/fields/util.ts b/src/fields/util.ts
index 205c500a5..799fa3758 100644
--- a/src/fields/util.ts
+++ b/src/fields/util.ts
@@ -241,19 +241,19 @@ export function distributeAcls(key: string, acl: SharingPermissions, target: Doc
 
         dataDoc[DirectLinks].forEach(link => distributeAcls(key, acl, link, visited, !!allowUpgrade));
 
-        DocListCast(dataDoc[Doc.LayoutFieldKey(dataDoc)]).forEach(d => {
+        DocListCast(dataDoc[Doc.LayoutDataKey(dataDoc)]).forEach(d => {
             distributeAcls(key, acl, d, visited, !!allowUpgrade);
             d !== d[DocData] && distributeAcls(key, acl, d[DocData], visited, !!allowUpgrade);
         });
 
-        DocListCast(dataDoc[Doc.LayoutFieldKey(dataDoc) + '_annotations']).forEach(d => {
+        DocListCast(dataDoc[Doc.LayoutDataKey(dataDoc) + '_annotations']).forEach(d => {
             distributeAcls(key, acl, d, visited, !!allowUpgrade);
             d !== d[DocData] && distributeAcls(key, acl, d[DocData], visited, !!allowUpgrade);
         });
 
-        Object.keys(target) // share expanded layout templates (eg, for presElementBox'es )
-            .filter(lkey => lkey.includes('layout[') && DocCast(target[lkey]))
-            .forEach(lkey => distributeAcls(key, acl, DocCast(target[lkey]), visited, !!allowUpgrade));
+        Object.keys(target) // share expanded layout templates (eg, for PresSlideBox'es )
+            .filter(lkey => lkey.includes('layout_[') && DocCast(target[lkey]))
+            .forEach(lkey => distributeAcls(key, acl, DocCast(target[lkey])!, visited, !!allowUpgrade));
 
         if (GetEffectiveAcl(dataDoc) === AclAdmin) {
             dataDoc[key] = acl;