From 7db8554d2482b8e1fa985bda52ad094b0aee9a3e Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 21 Oct 2025 10:20:13 +0100 Subject: [PATCH] Bug 40191: Account for no show component being set in Record Sources --- .../components/Admin/RecordSources/RecordSourcesResource.vue | 5 +++-- .../prog/js/vue/components/ResourceFormSave.vue | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue index 9967023aa48..87378202f67 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/RecordSources/RecordSourcesResource.vue @@ -40,6 +40,7 @@ export default { newLabel: $__("New record source"), }, props, + navigationOnFormSave: "RecordSourcesList", resourceAttrs: [ { name: "record_source_id", @@ -101,7 +102,7 @@ export default { baseResource.setMessage( $__("Record source updated!") ); - return recordResource + return recordResource; }, error => {} ); @@ -109,7 +110,7 @@ export default { return baseResource.apiClient.create(recordSource).then( recordResource => { baseResource.setMessage($__("Record source created!")); - return recordResource + return recordResource; }, error => {} ); 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 c8eb6ab3de7..e1fc2215c89 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ResourceFormSave.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ResourceFormSave.vue @@ -214,6 +214,7 @@ export default { callback: () => { saveOptionSelected.value = components.list; if ( + props.instancedResource.stickyToolbar && props.instancedResource.stickyToolbar.includes( "Form" ) @@ -229,6 +230,7 @@ export default { callback: () => { saveOptionSelected.value = components.show; if ( + props.instancedResource.stickyToolbar && props.instancedResource.stickyToolbar.includes( "Form" ) @@ -244,6 +246,7 @@ export default { callback: () => { saveOptionSelected.value = components.edit; if ( + props.instancedResource.stickyToolbar && props.instancedResource.stickyToolbar.includes( "Form" ) @@ -254,6 +257,7 @@ export default { }, }; return Object.keys(buttonOptions).reduce((acc, key) => { + if (!components[key]) return acc; if (key === "show" && !navigationOnFormSave) return acc; if (components[key] === navigationOnFormSave) return acc; return [buttonOptions[key], ...acc]; -- 2.50.1