From 631d7c193fc291f02354be86739bf9314a1a5340 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Mon, 20 Oct 2025 15:04:53 +0100 Subject: [PATCH] Bug 40191: Add the new functionality to the sticky toolbar --- .../js/vue/components/ResourceFormSave.vue | 36 ++++++++++++++++--- .../prog/js/vue/components/Toolbar.vue | 30 +++++++++++++++- .../vue/components/Vendors/VendorResource.vue | 22 ++---------- 3 files changed, 62 insertions(+), 26 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ResourceFormSave.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ResourceFormSave.vue index f5cc061bfe5..c8eb6ab3de7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ResourceFormSave.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ResourceFormSave.vue @@ -11,7 +11,12 @@

{{ instancedResource.i18n.newLabel }}

@@ -197,10 +202,10 @@ export default { const saveOptionSelected = ref( props.instancedResource.navigationOnFormSave ); - const dropdownButtons = computed(() => { + const saveDropdownButtonActions = computed(() => { const { components, navigationOnFormSave } = props.instancedResource; - + const formToSubmit = resourceForm.value; const buttonOptions = { list: { title: $__("Save and return to list"), @@ -208,6 +213,13 @@ export default { cssClass: "btn btn-default", callback: () => { saveOptionSelected.value = components.list; + if ( + props.instancedResource.stickyToolbar.includes( + "Form" + ) + ) { + formToSubmit.value.requestSubmit(); + } }, }, show: { @@ -216,6 +228,13 @@ export default { cssClass: "btn btn-default", callback: () => { saveOptionSelected.value = components.show; + if ( + props.instancedResource.stickyToolbar.includes( + "Form" + ) + ) { + formToSubmit.value.requestSubmit(); + } }, }, edit: { @@ -224,6 +243,13 @@ export default { cssClass: "btn btn-default", callback: () => { saveOptionSelected.value = components.edit; + if ( + props.instancedResource.stickyToolbar.includes( + "Form" + ) + ) { + formToSubmit.value.requestSubmit(); + } }, }, }; @@ -241,7 +267,7 @@ export default { resourceForm, saveAndNavigate, editMode, - dropdownButtons, + saveDropdownButtonActions, }; }, props: { diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue index 4a4b0bfea6a..bba969145d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue @@ -4,6 +4,33 @@ :class="sticky ? 'btn-toolbar sticky' : 'btn-toolbar'" ref="toolbar" > +