Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 23299: Switch address1 and streetnumber for German address format on opac-memberentry

Browse source 
Test plan:
Toggle value of pref AddressFormat and verify change on opac-memberentry.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Marcel de Rooy 2019-07-11 10:16:35 +00:00 committed by Martin Renvoize
parent 44a19e2d46
commit b2c34bde8b
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
View file

@ -7,6 +7,20 @@
[% USE KohaDates %]
[% USE Math %]
[% SET userupdateview = 1 %]
[% BLOCK streetnumber %]
[% UNLESS hidden.defined('streetnumber') %]
<li>
[% IF mandatory.defined('streetnumber') %]
<label for="borrower_streetnumber" class="required">Street number:</label>
[% ELSE %]
<label for="borrower_streetnumber">Street number:</label>
[% END %]
<input type="text" id="borrower_streetnumber" name="borrower_streetnumber" value="[% borrower.streetnumber | html %]" />
[% IF mandatory.defined('streetnumber') %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; [% IF action == 'edit' %]Update your personal details[% ELSE %]Register a new account[% END %]</title>
@ -370,18 +384,7 @@
<legend id="mainaddress_legend">Main address</legend>
<ol>
[% UNLESS hidden.defined('streetnumber') %]
<li>
[% IF mandatory.defined('streetnumber') %]
<label for="borrower_streetnumber" class="required">Street number:</label>
[% ELSE %]
<label for="borrower_streetnumber">Street number:</label>
[% END %]
<input type="text" id="borrower_streetnumber" name="borrower_streetnumber" value="[% borrower.streetnumber | html %]" />
[% IF mandatory.defined('streetnumber') %]<span class="required">Required</span>[% END %]
</li>
[% END %]
[% IF Koha.Preference('AddressFormat') != 'de' %][% INCLUDE streetnumber %][% END %]
[% UNLESS hidden.defined('address') %]
<li>
@ -396,6 +399,8 @@
</li>
[% END %]
[% IF Koha.Preference('AddressFormat') == 'de' %][% INCLUDE streetnumber %][% END %]
[% UNLESS hidden.defined('address2') %]
<li>
[% IF mandatory.defined('address2') %]