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

fixed bug in search where note with inherited attribute is not matched when the owning note is not matched, #2457

Browse Source
This commit is contained in:
zadam
2021-12-20 21:35:12 +01:00
parent b1c4737e78
commit b8eeb0371c
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,20 +23,18 @@ class AttributeExistsExp extends Expression {
for (const attr of attrs) {
const note = attr.note;
if (inputNoteSet.hasNoteId(note.noteId)) {
if (attr.isInheritable) {
resultNoteSet.addAll(note.getSubtreeNotesIncludingTemplated());
}
else if (note.isTemplate()) {
resultNoteSet.addAll(note.getTemplatedNotes());
}
else {
resultNoteSet.add(note);
}
if (attr.isInheritable) {
resultNoteSet.addAll(note.getSubtreeNotesIncludingTemplated());
}
else if (note.isTemplate()) {
resultNoteSet.addAll(note.getTemplatedNotes());
}
else {
resultNoteSet.add(note);
}
}
return resultNoteSet;
return resultNoteSet.intersection(inputNoteSet);
}
}