From ffeb07c6cb668c7d443d6bbffa53f265506dc12a 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=UTF-8 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ä --- .../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 17c1d99fc3..ad250094e0 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 @@ -58,25 +58,27 @@ [% BLOCK 'alt-address-style_roadtypes' %] [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] [% 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 609509c943..055319f139 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 @@ -49,25 +49,27 @@ [% BLOCK 'address-style_roadtypes' %] [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] [% IF roadtypes %] -
  • - [% IF ( mandatorystreettype ) %] -
  • + Street type: + + [% IF ( mandatorystreettype ) %]Required[% END %] + + [% END %] [% END %] [% END %] -- 2.20.1