Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 03:16:11 +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

2
src/public/app/components/entrypoints.js
View File

@@ -172,7 +172,7 @@ export default class Entrypoints extends Component {
const resp = await server.post(`sql/execute/${note.noteId}`);
if (!resp.success) {
toastService.showError(`Error occurred while executing SQL query: ${resp.message}`);
toastService.showError(`Error occurred while executing SQL query: ${resp.error}`);
}
await appContext.triggerEvent('sqlQueryResults', {ntxId: ntxId, results: resp.results});