From 6a1a2b41132fcbe3f91e18bd5ecd6cd98fba6987 Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Date: Tue, 28 Mar 2023 14:23:04 +0000
Subject: [PATCH] Bug 33355: Fix is_perpetual radio buttons in
 AgreementsFormAdd

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 43ff73c01dc07846e35681a9c206a238c3dde98e)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../js/vue/components/ERM/AgreementsFormAdd.vue  | 16 +++++++++-------
 .../prog/js/vue/components/ERM/Main.vue          |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
index 8374e037d3..8e0783aca8 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
@@ -92,12 +92,13 @@
                                 />
                             </li>
                             <li>
-                                <label
-                                    for="agreement_is_perpetual"
-                                    class="radio"
+                                <label for="agreement_is_perpetual"
                                     >{{ $__("Is perpetual") }}:</label
                                 >
-                                <label for="agreement_is_perpetual_yes">
+                                <label
+                                    class="radio"
+                                    for="agreement_is_perpetual_yes"
+                                    >{{ $__("Yes") }}:
                                     <input
                                         type="radio"
                                         name="is_perpetual"
@@ -105,9 +106,11 @@
                                         :value="true"
                                         v-model="agreement.is_perpetual"
                                     />
-                                    {{ $__("Yes") }}:
                                 </label>
-                                <label for="agreement_is_perpetual_no">
+                                <label
+                                    class="radio"
+                                    for="agreement_is_perpetual_no"
+                                    >{{ $__("No") }}:
                                     <input
                                         type="radio"
                                         name="is_perpetual"
@@ -115,7 +118,6 @@
                                         :value="false"
                                         v-model="agreement.is_perpetual"
                                     />
-                                    {{ $__("No") }}:
                                 </label>
                             </li>
                             <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue
index 9f4a1c99dd..b6c827d810 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue
@@ -263,7 +263,7 @@ form .v-select {
 }
 
 .v-select,
-input:not([type="submit"]):not([type="search"]):not([type="button"]):not([type="checkbox"]),
+input:not([type="submit"]):not([type="search"]):not([type="button"]):not([type="checkbox"]):not([type="radio"]),
 textarea {
     border-color: rgba(60, 60, 60, 0.26);
     border-width: 1px;
-- 
2.39.2