gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix sharing of templates, #3562

Browse Source
This commit is contained in:
zadam 2023-02-01 22:55:31 +01:00
parent 88e09eb279
commit 460b5fb3a4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/public/app/entities/fnote.js
View File

@ -707,7 +707,7 @@ class FNote {
return promotedAttrs; return promotedAttrs;
} }
hasAncestor(ancestorNoteId, visitedNoteIds = null) { hasAncestor(ancestorNoteId, followTemplates = false, visitedNoteIds = null) {
if (this.noteId === ancestorNoteId) { if (this.noteId === ancestorNoteId) {
return true; return true;
} }
@ -721,14 +721,16 @@ class FNote {
visitedNoteIds.add(this.noteId); visitedNoteIds.add(this.noteId);
for (const templateNote of this.getNotesToInheritAttributesFrom()) { if (followTemplates) {
if (templateNote.hasAncestor(ancestorNoteId, visitedNoteIds)) { for (const templateNote of this.getNotesToInheritAttributesFrom()) {
return true; if (templateNote.hasAncestor(ancestorNoteId, followTemplates, visitedNoteIds)) {
return true;
}
} }
} }
for (const parentNote of this.getParentNotes()) { for (const parentNote of this.getParentNotes()) {
if (parentNote.hasAncestor(ancestorNoteId, visitedNoteIds)) { if (parentNote.hasAncestor(ancestorNoteId, followTemplates, visitedNoteIds)) {
return true; return true;
} }
} }

2
src/public/app/services/attributes.js
View File

@ -50,7 +50,7 @@ function isAffecting(attrRow, affectedNote) {
if (this.isInheritable) { if (this.isInheritable) {
for (const owningNote of owningNotes) { for (const owningNote of owningNotes) {
if (owningNote.hasAncestor(attrNote.noteId)) { if (owningNote.hasAncestor(attrNote.noteId, true)) {
return true; return true;
} }
} }