sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add possibility to define search home for hoisted notes, #1694

pull/255/head
zadam 2021-02-27 21:18:10 +07:00
parent 2c755bcc38
commit cb91dadeca
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/routes/api/date_notes.js
Unescape Escape View File

@ -66,14 +66,22 @@ function createSearchNote(req) {
const searchString = params.searchString || "";
let ancestorNoteId = params.ancestorNoteId;
const today = dateUtils.localNowDate();
const hoistedNote = cls.getHoistedNoteId() ? repository.getNote(cls.getHoistedNoteId()) : null;
let searchHome =
attributeService.getNoteWithLabel('searchHome')
|| dateNoteService.getDateNote(today);
let searchHome;
if (hoistedNote) {
([searchHome] = hoistedNote.getDescendantNotesWithLabel('hoistedSearchHome'));
}
if (!searchHome) {
const today = dateUtils.localNowDate();
searchHome = attributeService.getNoteWithLabel('searchHome')
|| dateNoteService.getDateNote(today);
}
if (cls.getHoistedNoteId() && cls.getHoistedNoteId() !== 'root') {
const hoistedNote = repository.getNote(cls.getHoistedNoteId());
if (hoistedNote && hoistedNote.noteId !== 'root') {
if (!hoistedNote.getDescendantNoteIds().includes(searchHome.noteId)) {
// otherwise the note would be saved outside of the hoisted context which is weird
@ -81,7 +89,7 @@ function createSearchNote(req) {
}
if (!ancestorNoteId) {
ancestorNoteId = cls.getHoistedNoteId();
ancestorNoteId = hoistedNote.noteId;
}
}

1
src/services/attributes.js
Unescape Escape View File

@ -38,6 +38,7 @@ const BUILTIN_ATTRIBUTES = [
{ type: 'label', name: 'workspaceIconClass' },
{ type: 'label', name: 'workspaceTabBackgroundColor' },
{ type: 'label', name: 'searchHome' },
{ type: 'label', name: 'hoistedSearchHome' },
{ type: 'label', name: 'sqlConsoleHome' },
{ type: 'label', name: 'datePattern' },