From 808ad554a2927f24f575eccb0a532423a0c3a55d Mon Sep 17 00:00:00 2001
From: Emmi Takkinen <emmi.takkinen@koha-suomi.fi>
Date: Wed, 5 Jun 2024 10:21:43 +0300
Subject: [PATCH] Bug 31470: Do not change relationship value when adding a
 patron guarantor

Adding new id "relationship" led to unexpected behaviour
in relationship handling. If one edits patron with
non-patron guarantor and added patron guarantor, non-patron
guarantors relatioship field was set as empty value which is
first option on select field. This patch removes code which
sets relationship select field to use first value of option
automatically when patron guarantor is added.

Also thi patch add missing id to mandatory relatioship field.

To test:
1. Add or edit patron.
2. Add non-patron guarantor for patron and select some value
as their relationship.
3. Then add a patron guarantor.
=> Note that non-patron guarantors relationship is empty.
4. Apply this patch.
5. Repeat steps 1 to 3.
=> Relationship shouldn't change.

Sponsored-by: Koha-Suomi Oy
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
---
 .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt     | 2 +-
 koha-tmpl/intranet-tmpl/prog/js/members.js                      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 6b4bbacfca..283d0888f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -698,7 +698,7 @@ legend.collapsed i.fa.fa-caret-down::before {
                                                     <li>
                                                         [% IF mandatoryrelationship %]
                                                             <label for="relationship" class="required">Relationship: </label>
-                                                            <select class="relationship" name="relationship" required="required">
+                                                            <select class="relationship" name="relationship" id="relationship" required="required">
                                                         [% ELSE %]
                                                             <label for="relationship">Relationship: </label>
                                                             <select class="relationship" name="relationship" id="relationship">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/members.js b/koha-tmpl/intranet-tmpl/prog/js/members.js
index 2f58cb888c..c1042825ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/members.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/members.js
@@ -118,7 +118,6 @@ function select_user(borrowernumber, borrower, relationship) {
 
         var guarantor_relationship = $('#relationship').val();
         fieldset.find('.new_guarantor_relationship').first().val( guarantor_relationship );
-        $('#relationship').find('option:eq(0)').prop('selected', true);
 
         fieldset.find('.guarantor-details').first().attr( 'data-borrowernumber', borrowernumber );
 
-- 
2.39.2