merge

1 files changed, 11 insertions, 0 deletions

diff --git a/src/fields/util.ts b/src/fields/util.ts
index b3cbbe241..4a62a6a1f 100644
--- a/src/fields/util.ts
+++ b/src/fields/util.ts
@@ -1,8 +1,10 @@
 import { action, observable, runInAction, trace } from 'mobx';
 import { computedFn } from 'mobx-utils';
 import { DocServer } from '../client/DocServer';
+import { CollectionViewType } from '../client/documents/DocumentTypes';
 import { SerializationHelper } from '../client/util/SerializationHelper';
 import { UndoManager } from '../client/util/UndoManager';
+import { CollectionDockingView } from '../client/views/collections/CollectionDockingView';
 import { returnZero } from '../Utils';
 import CursorField from './CursorField';
 import {
@@ -278,6 +280,15 @@ function getEffectiveAcl(target: any, user?: string): symbol {
 export function distributeAcls(key: string, acl: SharingPermissions, target: Doc, inheritingFromCollection?: boolean, visited?: Doc[], isDashboard?: boolean) {
     if (!visited) visited = [] as Doc[];
     if (visited.includes(target)) return;
+
+    if ((target._viewType === CollectionViewType.Docking && visited.length > 1) || Doc.GetProto(visited[0]) !== Doc.GetProto(target)) {
+        target[key] = acl;
+        if (target !== Doc.GetProto(target)) {
+            //apparently we can't call updateCachedAcls twice (once for the main dashboard, and again for the nested dashboard...???)
+            updateCachedAcls(target);
+        }
+        return;
+    }
     visited.push(target);
 
     const HierarchyMapping = new Map<string, number>([