gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-05 01:18:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

add back utcDateModified to Attribute and Branch becca entities

Browse Source
This commit is contained in:
zadam 2021-06-26 17:32:40 +02:00
parent 0265c190db
commit 16cc84be99
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/becca/becca_loader.js
View File

@ -29,11 +29,11 @@ function load() {
new Note(row);
}
for (const row of sql.iterateRows(`SELECT branchId, noteId, parentNoteId, prefix, notePosition, isExpanded FROM branches WHERE isDeleted = 0`, [])) {
for (const row of sql.iterateRows(`SELECT branchId, noteId, parentNoteId, prefix, notePosition, isExpanded, utcDateModified FROM branches WHERE isDeleted = 0`, [])) {
new Branch(row);
}
for (const row of sql.iterateRows(`SELECT attributeId, noteId, type, name, value, isInheritable, position FROM attributes WHERE isDeleted = 0`, [])) {
for (const row of sql.iterateRows(`SELECT attributeId, noteId, type, name, value, isInheritable, position, utcDateModified FROM attributes WHERE isDeleted = 0`, [])) {
new Attribute(row);
}

3
src/becca/entities/abstract_entity.js
View File

@ -35,8 +35,7 @@ class AbstractEntity {
}
getUtcDateChanged() {
// FIXME
return this.utcDateModified || this.utcDateCreated || "FAKE";
return this.utcDateModified || this.utcDateCreated;
}
get becca() {

6
src/becca/entities/attribute.js
View File

@ -28,6 +28,8 @@ class Attribute extends AbstractEntity {
this.value = row.value;
/** @param {boolean} */
this.isInheritable = !!row.isInheritable;
/** @param {string} */
this.utcDateModified = row.utcDateModified;
if (this.attributeId) {
this.becca.attributes[this.attributeId] = this;
@ -136,6 +138,8 @@ class Attribute extends AbstractEntity {
this.isInheritable = false;
}
this.utcDateModified = dateUtils.utcNowDateTime();
super.beforeSaving();
this.becca.attributes[this.attributeId] = this;
@ -150,7 +154,7 @@ class Attribute extends AbstractEntity {
position: this.position,
value: this.value,
isInheritable: this.isInheritable,
utcDateModified: dateUtils.utcNowDateTime(),
utcDateModified: this.utcDateModified,
isDeleted: false
};
}

2
src/becca/entities/branch.js
View File

@ -26,6 +26,8 @@ class Branch extends AbstractEntity {
this.notePosition = row.notePosition;
/** @param {boolean} */
this.isExpanded = !!row.isExpanded;
/** @param {string} */
this.utcDateModified = row.utcDateModified;
if (this.branchId === 'root') {
return;