diff options
| author | bobzel <zzzman@gmail.com> | 2020-08-06 20:06:47 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2020-08-06 20:06:47 -0400 |
| commit | 7566ab0811a2503936f0a2e9a803db422dc1d44f (patch) | |
| tree | edb4dd5e7c19da62322bc8dff1fb10736d821c25 /src/fields | |
| parent | 002eb8c7cd45bf4ad3e4e1e99ccb70675029678b (diff) | |
| parent | 318f2bab4f086ce626fc3f1d099d1a09e245f95d (diff) | |
merged presentation_updates with master
Diffstat (limited to 'src/fields')
| -rw-r--r-- | src/fields/Doc.ts | 4 | ||||
| -rw-r--r-- | src/fields/util.ts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts index 6163fedbb..6bfe91378 100644 --- a/src/fields/Doc.ts +++ b/src/fields/Doc.ts @@ -508,9 +508,9 @@ export namespace Doc { alias.aliasOf = doc; alias.title = ComputedField.MakeFunction(`renameAlias(this, ${Doc.GetProto(doc).aliasNumber = NumCast(Doc.GetProto(doc).aliasNumber) + 1})`); alias.author = Doc.CurrentUserEmail; + alias[AclSym] = doc[AclSym]; - if (!doc.aliases) doc.aliases = new List<Doc>([alias]); - else Doc.AddDocToList(doc, "aliases", alias); + Doc.AddDocToList(doc[DataSym], "aliases", alias); return alias; } diff --git a/src/fields/util.ts b/src/fields/util.ts index 44a3317db..4c71572db 100644 --- a/src/fields/util.ts +++ b/src/fields/util.ts @@ -220,7 +220,7 @@ export function distributeAcls(key: string, acl: SharingPermissions, target: Doc // maps over the aliases of the document if (target.aliases) { DocListCast(target.aliases).map(alias => { - distributeAcls(key, acl, alias); + distributeAcls(key, acl, alias, inheritingFromCollection); }); } |