zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-22 00:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #105

Browse source
This commit is contained in:
azivner 2018-05-22 23:51:13 -04:00
parent 0ce5caefe8
commit a372cbb2df
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/entities/entity.js
View file

@ -21,8 +21,11 @@ class Entity {
contentToHash += "|" + this[propertyName]; contentToHash += "|" + this[propertyName];
} }
// this IF is to ease the migration from before hashed options, can be later removed
if (this.constructor.tableName !== 'options' || this.isSynced) {
this["hash"] = utils.hash(contentToHash).substr(0, 10); this["hash"] = utils.hash(contentToHash).substr(0, 10);
} }
}
async save() { async save() {
await repository.updateEntity(this); await repository.updateEntity(this);

5
src/services/script.js
View file

@ -1,6 +1,8 @@
const sql = require('./sql'); const sql = require('./sql');
const ScriptContext = require('./script_context'); const ScriptContext = require('./script_context');
const repository = require('./repository'); const repository = require('./repository');
const cls = require('./cls');
const sourceIdService = require('./source_id');
async function executeNote(note) { async function executeNote(note) {
if (!note.isJavaScript()) { if (!note.isJavaScript()) {
@ -49,6 +51,9 @@ async function executeScript(script, params, startNoteId, currentNoteId) {
} }
async function execute(ctx, script, paramsStr) { async function execute(ctx, script, paramsStr) {
// scripts run as "server" sourceId so clients recognize the changes as "foreign" and update themselves
cls.namespace.set('sourceId', sourceIdService.getCurrentSourceId());
return await (function() { return eval(`const apiContext = this;\r\n(${script}\r\n)(${paramsStr})`); }.call(ctx)); return await (function() { return eval(`const apiContext = this;\r\n(${script}\r\n)(${paramsStr})`); }.call(ctx));
} }