Bug 25069: Fix AddressFormat="fr" behavior
Something went wrong during a rebase of bug 13618 commitdcd1f5d48cBug 13618: Add html filters to all the variables Several changes related to AddressFormat are wrong: - [% IF Koha.Preference( 'AddressFormat' ) %] - [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] - [% ELSE %] - [% INCLUDE 'member-main-address-style-us.inc' %] - [% END %] + [% SWITCH Koha.Preference( 'AddressFormat' ) %] + [% CASE 'de' %] + [% INCLUDE 'member-main-address-style-de.inc' %] + [% CASE # us %] + [% INCLUDE 'member-main-address-style-us.inc' %] + [% END %] Test plan: Create a patron with all the address fields filled Play with the 3 option values of AddressFormat, and confirm that the address is displayed correctly on the patron's view, and in the patron module (top left) Signed-off-by: Joy Nelson <joy@bywatersolutions.com> (cherry picked from commitb7e9de9a43) Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
parent
5741383cf3
commit
1aef2f34e5
|
|
@ -27,11 +27,10 @@
|
|||
|
||||
<ul class="patronbriefinfo">
|
||||
[% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
|
||||
[% SWITCH Koha.Preference( 'AddressFormat' ) %]
|
||||
[% CASE 'de' %]
|
||||
[% INCLUDE 'member-display-address-style-de.inc' %]
|
||||
[% CASE # us %]
|
||||
[% INCLUDE 'member-display-address-style-us.inc' %]
|
||||
[% IF Koha.Preference( 'AddressFormat' ) %]
|
||||
[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
|
||||
[% ELSE %]
|
||||
[% INCLUDE 'member-display-address-style-us.inc' %]
|
||||
[% END %]
|
||||
|
||||
[% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone">
|
||||
|
|
|
|||
|
|
@ -427,6 +427,8 @@
|
|||
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
|
||||
[% IF Koha.Preference( 'AddressFormat' ) %]
|
||||
[% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
|
||||
[% ELSE %]
|
||||
[% INCLUDE 'member-main-address-style-us.inc' %]
|
||||
[% END %]
|
||||
[% END # nostreet && nocity etc group%]
|
||||
|
||||
|
|
@ -516,23 +518,20 @@
|
|||
[% IF ( step_6 ) %]
|
||||
|
||||
[% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
|
||||
[% SWITCH Koha.Preference( 'AddressFormat' ) %]
|
||||
[% CASE 'de' %]
|
||||
[% INCLUDE 'member-alt-address-style-de.inc' %]
|
||||
[% CASE # us %]
|
||||
[% IF Koha.Preference( 'AddressFormat' ) %]
|
||||
[% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
|
||||
[% ELSE %]
|
||||
[% INCLUDE 'member-alt-address-style-us.inc' %]
|
||||
[% END %]
|
||||
|
||||
[% END %]
|
||||
[% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
|
||||
[% END %]
|
||||
[% IF ( step_2 ) %]
|
||||
[% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
|
||||
[% SWITCH Koha.Preference( 'AddressFormat' ) %]
|
||||
[% CASE 'de' %]
|
||||
[% INCLUDE 'member-alt-contact-style-de.inc' %]
|
||||
[% CASE # us %]
|
||||
[% IF Koha.Preference( 'AddressFormat' ) %]
|
||||
[% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
|
||||
[% ELSE %]
|
||||
[% INCLUDE 'member-alt-contact-style-us.inc' %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
|
||||
|
||||
[% END %]
|
||||
|
|
|
|||
Loading…
Reference in New Issue