From b4d617c19b8addec493ede12e74f18fcc7e75d92 Mon Sep 17 00:00:00 2001 From: Lucas Gass 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 Signed-off-by: Joonas Kylmälä Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 5c262d4511428446ae46594792e0190db5130d4d) Signed-off-by: Fridolin Somers --- .../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 %] -
  • - [% IF ( mandatoryB_streettype ) %] -
  • + Street type: + + [% IF ( mandatoryB_streettype ) %]Required[% END %] + + [% 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 %] -
  • - [% IF ( mandatorystreettype ) %] -
  • + Street type: + + [% IF ( mandatorystreettype ) %]Required[% END %] + + [% END %] [% END %] [% END %] -- 2.39.5