Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

fixes to recent changes

Browse Source
This commit is contained in:
azivner
2017-12-03 17:46:56 -05:00
parent 34f1eb930c
commit 3a26054619
3 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/javascripts/dialogs/recent_changes.js
View File

@@ -33,9 +33,18 @@ const recentChanges = (function() {
.attr('note-path', change.note_id)
.attr('note-history-id', change.note_history_id);
let noteLink;
if (change.current_is_deleted) {
noteLink = change.current_note_title;
}
else {
noteLink = link.createNoteLink(change.note_id, change.note_title);
}
changesListEl.append($('<li>')
.append(formattedTime + ' - ')
.append(link.createNoteLink(change.note_id))
.append(noteLink)
.append(' (').append(revLink).append(')'));
}

46
public/javascripts/note_tree.js
View File

@@ -184,7 +184,32 @@ const noteTree = (function() {
}
async function activateNode(notePath) {
const runPath = getRunPath(notePath);
const noteId = treeUtils.getNoteIdFromNotePath(notePath);
let parentNoteId = 'root';
for (const childNoteId of runPath) {
const node = getNodesByNoteId(childNoteId).find(node => node.data.note_pid === parentNoteId);
if (childNoteId === noteId) {
await node.setActive();
}
else {
await node.setExpanded();
}
parentNoteId = childNoteId;
}
}
/**
* Accepts notePath and tries to resolve it. Part of the path might not be valid because of note moving (which causes
* path change) or other corruption, in that case this will try to get some other valid path to the correct note.
*/
function getRunPath(notePath) {
const path = notePath.split("/").reverse();
path.push('root');
const effectivePath = [];
let childNoteId = null;
@@ -224,27 +249,16 @@ const noteTree = (function() {
}
}
if (parentNoteId === 'root') {
break;
}
else {
effectivePath.push(parentNoteId);
childNoteId = parentNoteId;
}
const noteId = treeUtils.getNoteIdFromNotePath(notePath);
const runPath = effectivePath.reverse();
let parentNoteId = 'root';
for (const childNoteId of runPath) {
const node = getNodesByNoteId(childNoteId).find(node => node.data.note_pid === parentNoteId);
if (childNoteId === noteId) {
await node.setActive();
}
else {
await node.setExpanded();
}
parentNoteId = childNoteId;
}
return effectivePath.reverse();
}
function showParentList(noteId, node) {

12
routes/api/recent_changes.js
View File

@@ -6,7 +6,17 @@ const sql = require('../../services/sql');
const auth = require('../../services/auth');
router.get('/', auth.checkApiAuth, async (req, res, next) => {
const recentChanges = await sql.getResults("SELECT * FROM notes_history order by date_modified_to desc limit 1000");
const recentChanges = await sql.getResults(
`SELECT
notes.is_deleted AS current_is_deleted,
notes.note_title AS current_note_title,
notes_history.*
FROM
notes_history
JOIN notes USING(note_id)
ORDER BY
date_modified_to DESC
LIMIT 1000`);
res.send(recentChanges);
});