From b4d617c19b8addec493ede12e74f18fcc7e75d92 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Wed, 1 Sep 2021 14:17:21 +0000
Subject: [PATCH] Bug 28392: make streettype and B_streettype work with
 BorrowerUnwantedField
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

To test:
1. Add values to the AV ROADTYPE
2. Go to the BorrowerUnwantedField system preference and attempt to hide streettype and B_streettype.
3. It doesn't work, the fields still show.
4. Apply patch
5. Repeat step 2, it should work now.

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>

Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5c262d4511428446ae46594792e0190db5130d4d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../en/includes/member-alt-address-style.inc  | 38 ++++++++++---------
 .../en/includes/member-main-address-style.inc | 38 ++++++++++---------
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
index f31f379d84..c6809b4bce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
@@ -56,25 +56,27 @@
 
 [% BLOCK 'alt-address-style_roadtypes' %]
     [% IF roadtypes %]
-        <li>
-            [% IF ( mandatoryB_streettype ) %]
-                <label for="B_streettype" class="required">
-            [% ELSE %]
-                <label for="B_streettype">
-            [% END %]
-            Street type: </label>
-            <select name="B_streettype">
-                <option value=""></option>
-                [% FOR roadtype IN roadtypes %]
-                    [% IF roadtype.authorised_value == patron.B_streettype %]
-                        <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option>
-                    [% ELSE %]
-                        <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option>
-                    [% END %]
+        [% UNLESS noB_streettype %]
+            <li>
+                [% IF ( mandatoryB_streettype ) %]
+                    <label for="B_streettype" class="required">
+                [% ELSE %]
+                    <label for="B_streettype">
                 [% END %]
-            </select>
-            [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %]
-        </li>
+                Street type: </label>
+                <select name="B_streettype">
+                    <option value=""></option>
+                    [% FOR roadtype IN roadtypes %]
+                        [% IF roadtype.authorised_value == patron.B_streettype %]
+                            <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option>
+                        [% ELSE %]
+                            <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option>
+                        [% END %]
+                    [% END %]
+                </select>
+                [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %]
+            </li>
+        [% END %]
     [% END %]
 [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
index 8ed3792d91..ef24f0537b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
@@ -47,25 +47,27 @@
 
 [% BLOCK 'address-style_roadtypes' %]
     [% IF roadtypes %]
-        <li>
-            [% IF ( mandatorystreettype ) %]
-                <label for="streettype" class="required">
-            [% ELSE %]
-                <label for="streettype">
-            [% END %]
-            Street type: </label>
-            <select name="streettype">
-                <option value=""></option>
-                [% FOR roadtype IN roadtypes %]
-                    [% IF roadtype.authorised_value == patron.streettype %]
-                        <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option>
-                    [% ELSE %]
-                        <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option>
-                    [% END %]
+        [% UNLESS nostreettype %]
+            <li>
+                [% IF ( mandatorystreettype ) %]
+                    <label for="streettype" class="required">
+                [% ELSE %]
+                    <label for="streettype">
                 [% END %]
-            </select>
-            [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
-        </li>
+                Street type: </label>
+                <select name="streettype">
+                    <option value=""></option>
+                    [% FOR roadtype IN roadtypes %]
+                        [% IF roadtype.authorised_value == patron.streettype %]
+                            <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option>
+                        [% ELSE %]
+                            <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option>
+                        [% END %]
+                    [% END %]
+                </select>
+                [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
+            </li>
+        [% END %]
     [% END %]
 [% END %]
 
-- 
2.39.5