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

Bug 25069: Fix AddressFormat="fr" behavior 

Something went wrong during a rebase of bug 13618
  commit dcd1f5d48c
  Bug 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: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Jonathan Druart 2020-04-06 12:44:13 +02:00 committed by Martin Renvoize
parent 9e2f3200ea
commit 9ac2ddda0b
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
View File

@ -29,11 +29,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">

20
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
View File

@ -561,6 +561,8 @@ legend:hover {
[% 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 # /UNLESS nostreet && nocity etc group%]
@ -726,22 +728,20 @@ legend:hover {
[% 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_6 ) %]
[% 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 %]
[% INCLUDE 'member-alt-contact-style-us.inc' %]
[% IF Koha.Preference( 'AddressFormat' ) %]
[% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-alt-contact-style-us.inc' %]
[% END %]
[% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
[% END # /IF ( step_2 ) %]