gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 28392: make streettype and B_streettype work with BorrowerUnwantedField 

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 5c262d4511)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Lucas Gass 2021-09-01 14:17:21 +00:00 committed by Fridolin Somers
parent 12d1543cf4
commit b4d617c19b
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
View File

@ -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 %]

38
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
View File

@ -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 %]