diff --git a/src/becca/entities/note_revision.js b/src/becca/entities/note_revision.js index 08fb710b4..95582ed33 100644 --- a/src/becca/entities/note_revision.js +++ b/src/becca/entities/note_revision.js @@ -166,12 +166,14 @@ class NoteRevision extends AbstractEntity { utcDateLastEdited: this.utcDateLastEdited, utcDateCreated: this.utcDateCreated, utcDateModified: this.utcDateModified, + content: this.content, contentLength: this.contentLength }; } getPojoToSave() { const pojo = this.getPojo(); + delete pojo.content; // not getting persisted delete pojo.contentLength; // not getting persisted if (pojo.isProtected) { diff --git a/src/public/app/layouts/desktop_layout.js b/src/public/app/layouts/desktop_layout.js index e6459b996..2eee0b842 100644 --- a/src/public/app/layouts/desktop_layout.js +++ b/src/public/app/layouts/desktop_layout.js @@ -141,7 +141,7 @@ export default class DesktopLayout { .ribbon(new NoteInfoWidget()) .button(new EditButton()) .button(new ButtonWidget() - .icon('bx bx-history') + .icon('bx-history') .title("Note Revisions") .command("showNoteRevisions") .titlePlacement("bottom")) diff --git a/src/public/app/widgets/containers/ribbon_container.js b/src/public/app/widgets/containers/ribbon_container.js index 5b398cda8..2b68f042f 100644 --- a/src/public/app/widgets/containers/ribbon_container.js +++ b/src/public/app/widgets/containers/ribbon_container.js @@ -310,7 +310,7 @@ export default class RibbonContainer extends NoteContextAwareWidget { // won't trigger .refresh(); await super.handleEventInChildren('setNoteContext', data); } - else if (this.isEnabled()) { + else if (this.isEnabled() || name === 'initialRenderComplete') { const activeRibbonWidget = this.getActiveRibbonWidget(); // forward events only to active ribbon tab, inactive ones don't need to be updated diff --git a/src/public/app/widgets/sql_result.js b/src/public/app/widgets/sql_result.js index 895b0d1f1..142dc79e3 100644 --- a/src/public/app/widgets/sql_result.js +++ b/src/public/app/widgets/sql_result.js @@ -40,6 +40,15 @@ export default class SqlResultWidget extends NoteContextAwareWidget { this.$resultContainer.empty(); for (const rows of results) { + if (typeof rows === 'object' && !Array.isArray(rows)) { + // inserts, updates + this.$resultContainer.empty().show().append( + $("
").text(JSON.stringify(rows, null, '\t'))
+                );
+
+                continue;
+            }
+
             if (!rows.length) {
                 continue;
             }