diff --git a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue index 159de9c955..c84265f4bc 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue +++ b/notes-webapp/src/main/webapp/vue-app/notes-treeview/components/NoteTreeviewDrawer.vue @@ -771,7 +771,7 @@ export default { this.$root.$emit('include-page', note); this.$refs.breadcrumbDrawer.close(); } else if (this.movePage) { - if (note.noteId !== this.note.id) { + if (note.noteId !== this.note.id && note.noteId !== this.note.parentPageId) { this.$notesService.getNoteById(note.noteId,'', '', '', '', true).then(data => { this.breadcrumb = data?.breadcrumb || []; this.enableMove = true; @@ -779,6 +779,8 @@ export default { this.destinationNote = data; }); } else { + this.enableMove=false; + this.breadcrumb = []; Object.assign(this.destinationNote, this.note); } } else { @@ -961,7 +963,6 @@ export default { }, closeAllDrawer() { this.checkbox = false; - $('.spaceButtomNavigation').removeClass('hidden'); this.search = ''; if (this.exporting) { this.$root.$emit('cancel-export-notes'); diff --git a/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue b/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue index f491330203..e458ea0587 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue +++ b/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue @@ -324,7 +324,7 @@ canPublish: canPublish, canSchedule: canScheduleNotePublication }" - :edit-mode="published" + :edit-mode="false" @publish="publishNote" /> @@ -679,6 +679,7 @@ export default { }, mounted() { this.handleChangePages(); + Vue.prototype.$utils.includeExtensions('NotesExtension'); $(document).on('click', () => { this.translationsMenu = false; }); diff --git a/notes-webapp/src/main/webapp/vue-app/notes/main.js b/notes-webapp/src/main/webapp/vue-app/notes/main.js index 38c5653715..9e31f21d0b 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes/main.js +++ b/notes-webapp/src/main/webapp/vue-app/notes/main.js @@ -51,5 +51,5 @@ export function init() { vuetify, i18n }, appElement, 'Notes Overview'); - }).finally(() => Vue.prototype.$utils.includeExtensions('NotesExtension')); + }); }