From 91e77bd130622dbcb9087456d8a2dce50fa5a809 Mon Sep 17 00:00:00 2001
From: Emmi Takkinen <emmi.takkinen@koha-suomi.fi>
Date: Wed, 14 Dec 2022 12:08:33 +0200
Subject: [PATCH] Bug 31470: Add id "relationship"  to memberentrygen.tt,
 change id "relationship" in auth-finder-search.inc

In members.js line 112 variable guarantor_relationship is selected
with id "relationship". However id "relationship" is used in
auth-finder-search.inc, not in memberentrygen.tt.

One way to see what kind of effect incorrect selector has (and how I
originally stumbled into this), is to add into "IntranetUserJS" a line
which changes non-patron guarantors relationship default selected value as
other than empty. Script has to change "relationship" instead of
"new_guarantor_relationship" because selector input for patron guarantors
relationship actually uses default selected value from non-patron guarantors
relationship.

This patch changes two things. Firstly it adds id "relationship" to
memberentrygen.tt so that member.js can fetch correct value
to variable guarantor_relatioship. Secondly it changes id "relationship"
in auth-finder-search.tt as "special_relationship" to avoid confusion.

To test memberentrygen.tt:
1. Make sure you have some value(s) in syspref "borrowerRelationship" e.g. "guarantor".
2. Add following line to "IntranetUseJS": $('.relationship option:eq(1)').attr('selected', 'selected');
3. Add guarantee patron and note that non-patron guarantors relationship is now "guarantor".
4. Add patron guarantor and note that relationship value is empty.
5. Apply this patch and refresh page.
6. Repeat step 4.
=> Note that now relationship value is "guarantor".

To test auth-finder-search.inc:
1. Add authority e.g. Chronological Term
2. Modify field 551$a, click "Tag editor" icon from right
3. Searc pop-up is opened.
=> Make sure that field "Special relationship" is highlighted
when you hover mouse over label.
=> Make sure that after performing a search, search value in
"Special relationship" field persists.

Sponsored-by: Koha-Suomi Oy
---
 .../intranet-tmpl/prog/en/includes/auth-finder-search.inc     | 4 ++--
 .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
index 4f742e2b92..31dd28a49b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
@@ -140,8 +140,8 @@
         <fieldset class="rows"><legend>Relationship information</legend>
             <ol>
             <li>
-                <label for="relationship">Special relationship: </label>
-                <select name="relationship" id="relationship">
+                <label for="special_relationship">Special relationship: </label>
+                <select name="relationship" id="special_relationship">
                     [% selected=relationship | html %]
                     [% PROCESS selectoptionopen value='' %]None specified</option>
                     [% IF Koha.Preference('marcflavour') == 'MARC21' %]
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 48f62ddd52..31a9800e51 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -669,7 +669,7 @@ legend:hover {
                                                     [% IF possible_relationships %]
                                                         <li>
                                                             <label for="relationship">Relationship: </label>
-                                                            <select class="relationship" name="relationship">
+                                                            <select class="relationship" name="relationship" id="relationship">
                                                                 <option value=""></option>
                                                                 [% FOREACH pr IN possible_relationships.split('\|') %]
                                                                     [% IF pr == borrower_data.relationship %]
-- 
2.34.1