diff --git a/db/migrations/0187__add_changeId_to_entity_changes.sql b/db/migrations/0187__add_changeId_to_entity_changes.sql index e2350594b..1fdadbec7 100644 --- a/db/migrations/0187__add_changeId_to_entity_changes.sql +++ b/db/migrations/0187__add_changeId_to_entity_changes.sql @@ -1,13 +1,3 @@ --- delete duplicates https://github.com/zadam/trilium/issues/2534 -DELETE FROM entity_changes WHERE isErased = 0 AND id IN ( - SELECT id FROM entity_changes ec - WHERE ( - SELECT COUNT(*) FROM entity_changes - WHERE ec.entityName = entity_changes.entityName - AND ec.entityId = entity_changes.entityId - ) > 1 -); - CREATE TABLE IF NOT EXISTS "mig_entity_changes" ( `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, `entityName` TEXT NOT NULL, @@ -23,7 +13,17 @@ CREATE TABLE IF NOT EXISTS "mig_entity_changes" ( INSERT INTO mig_entity_changes (id, entityName, entityId, hash, isErased, changeId, sourceId, isSynced, utcDateChanged) SELECT id, entityName, entityId, hash, isErased, '', sourceId, isSynced, utcDateChanged FROM entity_changes; -DROP TABLE entity_changes; +-- delete duplicates https://github.com/zadam/trilium/issues/2534 +DELETE FROM mig_entity_changes WHERE isErased = 0 AND id IN ( + SELECT id FROM mig_entity_changes ec + WHERE ( + SELECT COUNT(*) FROM mig_entity_changes + WHERE ec.entityName = mig_entity_changes.entityName + AND ec.entityId = mig_entity_changes.entityId + ) > 1 +); + +DROP TABLE entity_changes; ALTER TABLE mig_entity_changes RENAME TO entity_changes; diff --git a/package.json b/package.json index cc5f3d000..77bb82e59 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "trilium", "productName": "Trilium Notes", "description": "Trilium Notes", - "version": "0.49.4", + "version": "0.49.5", "license": "AGPL-3.0-only", "main": "electron.js", "bin": { diff --git a/src/public/app/widgets/shared_info.js b/src/public/app/widgets/shared_info.js index d0aef4b20..6a830f8b6 100644 --- a/src/public/app/widgets/shared_info.js +++ b/src/public/app/widgets/shared_info.js @@ -13,7 +13,7 @@ const TPL = ` } - . For help visit wiki. + . For help visit wiki. `; export default class SharedInfoWidget extends NoteContextAwareWidget { @@ -23,8 +23,8 @@ export default class SharedInfoWidget extends NoteContextAwareWidget { doRender() { this.$widget = $(TPL); - this.$shareLink = this.$widget.find(".share-link"); - this.$shareText = this.$widget.find(".share-text"); + this.$sharedLink = this.$widget.find(".shared-link"); + this.$sharedText = this.$widget.find(".shared-text"); this.contentSized(); } @@ -36,14 +36,14 @@ export default class SharedInfoWidget extends NoteContextAwareWidget { if (syncServerHost) { link = syncServerHost + "/share/" + shareId; - this.$shareText.text("This note is shared publicly on"); + this.$sharedText.text("This note is shared publicly on"); } else { link = location.protocol + '//' + location.host + location.pathname + "share/" + shareId; - this.$shareText.text("This note is shared locally on"); + this.$sharedText.text("This note is shared locally on"); } - this.$shareLink.attr("href", link).text(link); + this.$sharedLink.attr("href", link).text(link); } entitiesReloadedEvent({loadResults}) { diff --git a/src/services/build.js b/src/services/build.js index 380750302..fe7d20395 100644 --- a/src/services/build.js +++ b/src/services/build.js @@ -1 +1 @@ -module.exports = { buildDate:"2022-01-09T22:32:13+01:00", buildRevision: "be59f248e8387c268471946da99979939c8d2c1d" }; +module.exports = { buildDate:"2022-01-14T21:40:37+01:00", buildRevision: "77c6c4617b634226e12ead172482fe1fe92bc360" };