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

Merge branch 'master' into next61

Browse Source 
# Conflicts:
#	package-lock.json
#	src/routes/api/recent_changes.js
This commit is contained in:
zadam
2023-06-13 23:25:35 +02:00
parent 38839532d5 6f16b4caec
commit ac56056f65
12 changed files with 1673 additions and 1146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/routes/api/recent_changes.js
View File

@@ -27,7 +27,8 @@ function getRecentChanges(req) {
for (const revisionRow of revisionRows) {
const note = becca.getNote(revisionRow.noteId);
if (note?.hasAncestor(ancestorNoteId)) {
// for deleted notes, the becca note is null, and it's not possible to (easily) determine if it belongs to a subtree
if (ancestorNoteId === 'root' || note?.hasAncestor(ancestorNoteId)) {
recentChanges.push(revisionRow);
}
}
@@ -43,8 +44,8 @@ function getRecentChanges(req) {
notes.title AS current_title,
notes.isProtected AS current_isProtected,
notes.title,
notes.utcDateCreated AS utcDate,
notes.dateCreated AS date
notes.utcDateCreated AS utcDate, -- different from the second SELECT
notes.dateCreated AS date -- different from the second SELECT
FROM notes
UNION ALL
SELECT
@@ -54,15 +55,16 @@ function getRecentChanges(req) {
notes.title AS current_title,
notes.isProtected AS current_isProtected,
notes.title,
notes.utcDateModified AS utcDate,
notes.dateModified AS date
notes.utcDateModified AS utcDate, -- different from the first SELECT
notes.dateModified AS date -- different from the first SELECT
FROM notes
WHERE notes.isDeleted = 1`);
for (const noteRow of noteRows) {
const note = becca.getNote(noteRow.noteId);
if (note?.hasAncestor(ancestorNoteId)) {
// for deleted notes, the becca note is null, and it's not possible to (easily) determine if it belongs to a subtree
if (ancestorNoteId === 'root' || note?.hasAncestor(ancestorNoteId)) {
recentChanges.push(noteRow);
}
}

2
src/routes/api/sql.js
View File

@@ -32,7 +32,7 @@ function execute(req) {
continue;
}
if (query.toLowerCase().startsWith('select')) {
if (query.toLowerCase().startsWith('select') || query.toLowerCase().startsWith('with')) {
results.push(sql.getRows(query));
}
else {