zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-11-12 02:37:39 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse source
This commit is contained in:
zadam 2022-01-31 21:25:37 +01:00
commit 2feb778d8d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/becca/entities/abstract_entity.js
View file

@ -104,13 +104,17 @@ class AbstractEntity {
const entityId = this[this.constructor.primaryKeyName]; const entityId = this[this.constructor.primaryKeyName];
const entityName = this.constructor.entityName; const entityName = this.constructor.entityName;
this.utcDateModified = dateUtils.utcNowDateTime();
sql.execute(`UPDATE ${entityName} SET isDeleted = 1, deleteId = ?, utcDateModified = ? sql.execute(`UPDATE ${entityName} SET isDeleted = 1, deleteId = ?, utcDateModified = ?
WHERE ${this.constructor.primaryKeyName} = ?`, WHERE ${this.constructor.primaryKeyName} = ?`,
[deleteId, dateUtils.utcNowDateTime(), entityId]); [deleteId, this.utcDateModified, entityId]);
if (this.dateModified) { if (this.dateModified) {
this.dateModified = dateUtils.localNowDateTime();
sql.execute(`UPDATE ${entityName} SET dateModified = ? WHERE ${this.constructor.primaryKeyName} = ?`, sql.execute(`UPDATE ${entityName} SET dateModified = ? WHERE ${this.constructor.primaryKeyName} = ?`,
[dateUtils.localNowDateTime(), entityId]); [this.dateModified, entityId]);
} }
log.info(`Marking ${entityName} ${entityId} as deleted`); log.info(`Marking ${entityName} ${entityId} as deleted`);