diff options
| author | bobzel <zzzman@gmail.com> | 2023-05-14 22:04:36 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2023-05-14 22:04:36 -0400 |
| commit | df7257d1b39f51a7e00a495f0d4a2366f0e21f7d (patch) | |
| tree | 723af1076052ae6f2df8cebf0082457fe1f32dc4 /src/fields | |
| parent | 42afc0250de658fc3e924864bfae5afb4edec335 (diff) | |
fixed webpage link following by adding a presData for the current URL to all embedded docs. fixed getView() in showDocuments to not get called with the proper anchors. changed unrendered MARKERs to CONFIGs. changed anchors to Configs or Markers as appropriate.
Diffstat (limited to 'src/fields')
| -rw-r--r-- | src/fields/Doc.ts | 2 | ||||
| -rw-r--r-- | src/fields/util.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts index deda4c876..5312da009 100644 --- a/src/fields/Doc.ts +++ b/src/fields/Doc.ts @@ -238,7 +238,7 @@ export class Doc extends RefField { Doc.MyFileOrphans instanceof Doc && Doc.IsDocDataProto(doc) && !Doc.IsSystem(doc) && - ![DocumentType.MARKER, DocumentType.KVP, DocumentType.LINK, DocumentType.LINKANCHOR].includes(doc.type as any) && + ![DocumentType.CONFIG, DocumentType.KVP, DocumentType.LINK, DocumentType.LINKANCHOR].includes(doc.type as any) && !doc.isFolder && !doc.annotationOn ) { diff --git a/src/fields/util.ts b/src/fields/util.ts index 2a6caaaa3..f4fd3200c 100644 --- a/src/fields/util.ts +++ b/src/fields/util.ts @@ -248,7 +248,7 @@ export function distributeAcls(key: string, acl: SharingPermissions, target: Doc if (!visited) visited = [] as Doc[]; if (!target || visited.includes(target)) return; - if ((target._viewType === CollectionViewType.Docking && visited.length > 1) || Doc.GetProto(visited[0]) !== Doc.GetProto(target)) { + if ((target._type_collection === 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...???) |