Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

stop #workspaceTemplate from being inherited (should have the same special behavior as #template)

Browse Source
This commit is contained in:
zadam
2022-09-16 23:03:02 +02:00
parent b816773d02
commit 05231bd1c2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/becca/entities/note.js
View File

@@ -403,7 +403,7 @@ class Note extends AbstractEntity {
templateAttributes.push( templateAttributes.push(
...templateNote.__getAttributes(newPath) ...templateNote.__getAttributes(newPath)
// template attr is used as a marker for templates, but it's not meant to be inherited // template attr is used as a marker for templates, but it's not meant to be inherited
.filter(attr => !(attr.type === 'label' && attr.name === 'template')) .filter(attr => !(attr.type === 'label' && (attr.name === 'template' || attr.name === 'workspacetemplate')))
); );
} }
} }

2
src/public/app/entities/note_short.js
View File

@@ -267,7 +267,7 @@ class NoteShort {
attrArrs.push( attrArrs.push(
templateNote.__getCachedAttributes(newPath) templateNote.__getCachedAttributes(newPath)
// template attr is used as a marker for templates, but it's not meant to be inherited // template attr is used as a marker for templates, but it's not meant to be inherited
.filter(attr => !(attr.type === 'label' && attr.name === 'template')) .filter(attr => !(attr.type === 'label' && (attr.name === 'template' || attr.name === 'workspacetemplate')))
); );
} }
} }

2
src/services/search/expressions/attribute_exists.js
View File

@@ -28,7 +28,7 @@ class AttributeExistsExp extends Expression {
} }
else if (note.isTemplate() && else if (note.isTemplate() &&
// template attr is used as a marker for templates, but it's not meant to be inherited // template attr is used as a marker for templates, but it's not meant to be inherited
!(this.attributeType === 'label' && this.attributeName === 'template')) { !(this.attributeType === 'label' && (this.attributeName === 'template' || this.attributeName === 'workspacetemplate'))) {
resultNoteSet.addAll(note.getTemplatedNotes()); resultNoteSet.addAll(note.getTemplatedNotes());
} }
else { else {