mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
fix filing entity changes for deleted notes
This commit is contained in:
parent
346f6edd7e
commit
c67644a2e3
@ -152,6 +152,10 @@ class Becca {
|
|||||||
.replace('_', '')
|
.replace('_', '')
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (!(camelCaseEntityName in this)) {
|
||||||
|
throw new Error(`Unknown entity name '${camelCaseEntityName}' (original argument '${entityName}')`);
|
||||||
|
}
|
||||||
|
|
||||||
return this[camelCaseEntityName][entityId];
|
return this[camelCaseEntityName][entityId];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,16 +100,38 @@ function fillEntityChanges(entityName, entityPrimaryKey, condition = '') {
|
|||||||
if (existingRows === 0) {
|
if (existingRows === 0) {
|
||||||
createdCount++;
|
createdCount++;
|
||||||
|
|
||||||
|
let hash;
|
||||||
|
let utcDateChanged;
|
||||||
|
let isSynced;
|
||||||
|
|
||||||
|
if (entityName.endsWith("_contents")) {
|
||||||
|
// FIXME: hacky, not sure if it might cause some problems
|
||||||
|
hash = "fake value";
|
||||||
|
utcDateChanged = dateUtils.utcNowDateTime();
|
||||||
|
isSynced = true; // contents are always synced
|
||||||
|
} else {
|
||||||
const entity = becca.getEntity(entityName, entityId);
|
const entity = becca.getEntity(entityName, entityId);
|
||||||
|
|
||||||
|
if (entity) {
|
||||||
|
hash = entity?.generateHash() || "|deleted";
|
||||||
|
utcDateChanged = entity?.getUtcDateChanged() || dateUtils.utcNowDateTime();
|
||||||
|
isSynced = entityName !== 'options' || !!entity?.isSynced;
|
||||||
|
} else {
|
||||||
// entity might be null (not present in becca) when it's deleted
|
// entity might be null (not present in becca) when it's deleted
|
||||||
|
// FIXME: hacky, not sure if it might cause some problems
|
||||||
|
hash = "deleted";
|
||||||
|
utcDateChanged = dateUtils.utcNowDateTime();
|
||||||
|
isSynced = true; // deletable (the ones with isDeleted) entities are synced
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
addEntityChange({
|
addEntityChange({
|
||||||
entityName,
|
entityName,
|
||||||
entityId,
|
entityId,
|
||||||
hash: entity?.generateHash() || "|deleted",
|
hash: hash,
|
||||||
isErased: false,
|
isErased: false,
|
||||||
utcDateChanged: entity?.getUtcDateChanged() || dateUtils.utcNowDateTime(),
|
utcDateChanged: utcDateChanged,
|
||||||
isSynced: entityName !== 'options' || !!entity?.isSynced
|
isSynced: isSynced
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user