aboutsummaryrefslogtreecommitdiff
path: root/src/fields/util.ts
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2021-08-09 14:26:14 -0400
committerbobzel <zzzman@gmail.com>2021-08-09 14:26:14 -0400
commit81ae5175aebf7e14a781a73d4a7cbaec0b8f3e4a (patch)
treebf6a46eaa3899048e13e28a99f375b3a0c34bd8a /src/fields/util.ts
parent8480bcbe9e5ddea4bac64273c2e6581d36bb49de (diff)
fixed augment only text to resize correctly with autoheight. fixed acls to cache correctly for new documents. fixed links to be shared across users. fixed links to always default to public.
Diffstat (limited to 'src/fields/util.ts')
-rw-r--r--src/fields/util.ts4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/fields/util.ts b/src/fields/util.ts
index 2bb6b45c2..439c4d333 100644
--- a/src/fields/util.ts
+++ b/src/fields/util.ts
@@ -141,7 +141,9 @@ export function denormalizeEmail(email: string) {
export function inheritParentAcls(parent: Doc, child: Doc) {
const dataDoc = parent[DataSym];
for (const key of Object.keys(dataDoc)) {
- key.startsWith("acl") && distributeAcls(key, dataDoc[key], child);
+ // if the default acl mode is private, then don't inherit the acl-Public permission, but set it to private.
+ const permission = (key === "acl-Public" && Doc.UserDoc().defaultAclPrivate) ? AclPrivate : dataDoc[key];
+ key.startsWith("acl") && distributeAcls(key, permission, child);
}
}