From 80da5e3d8a33b3af56291b570db76e096020b814 Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@openfifth.co.uk>
Date: Thu, 10 Apr 2025 08:49:20 +0000
Subject: [PATCH] Bug 38201: Radio FormElement follow-up

(cherry picked from commit 7e645f19fc3567bcbc2476ad1b4d21205282c4b6)
Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../prog/js/vue/components/FormElement.vue    | 23 +++++++++-----
 .../components/Preservation/TrainResource.vue | 31 +++++--------------
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue
index 427bb562ab..0f0a5376e6 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/FormElement.vue
@@ -42,14 +42,21 @@
         />
     </template>
     <template v-else-if="attr.type == 'radio'">
-        <input
-            type="radio"
-            :name="attr.name"
-            :id="getElementId"
-            :value="attr.value"
-            v-model="resource[attr.name]"
-            @change="attr.onChange && attr.onChange(resource)"
-        />
+        <template v-for="option in attr.options">
+            <label
+                v-if="option.description"
+                :for="attr.name + '_' + option.value"
+                >{{ option.description }}:</label
+            >
+            <input
+                type="radio"
+                :name="option.description"
+                :id="attr.name + '_' + option.value"
+                :value="option.value"
+                v-model="resource[attr.name]"
+                @change="attr.onChange && attr.onChange(resource)"
+            />
+        </template>
     </template>
     <template v-else-if="attr.type == 'boolean'">
         <label class="radio" :for="getElementId + '_yes'"
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainResource.vue
index e0f20060cd..57bcee2b0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainResource.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainResource.vue
@@ -238,32 +238,15 @@ export default {
         getTableFilters() {
             return [
                 {
-                    id: "all_status_filter",
+                    id: "status_filter",
                     name: "status_filter",
                     type: "radio",
-                    label: __("All"),
-                    value: "",
-                },
-                {
-                    id: "closed_status_filter",
-                    name: "status_filter",
-                    type: "radio",
-                    label: __("Closed"),
-                    value: "closed",
-                },
-                {
-                    id: "sent_status_filter",
-                    name: "status_filter",
-                    type: "radio",
-                    label: __("Sent"),
-                    value: "sent",
-                },
-                {
-                    id: "received_status_filter",
-                    name: "status_filter",
-                    type: "radio",
-                    label: __("Received"),
-                    value: "received",
+                    options: [
+                        { value: "all", description: __("All") },
+                        { value: "closed", description: _("Closed") },
+                        { value: "sent", description: __("Sent") },
+                        { value: "received", description: __("Received") },
+                    ],
                 },
             ];
         },