Something went wrong during a rebase of bug 13618 commit dcd1f5d48c758aee17b6c6f069c6146b42efe117 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 %]
Created attachment 102436 [details] [review] Bug 25069: Fix AddressFormat="fr" behavior Something went wrong during a rebase of bug 13618 commit dcd1f5d48c758aee17b6c6f069c6146b42efe117 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)
Created attachment 102437 [details] [review] Bug 25069: Fix AddressFormat="fr" behavior Something went wrong during a rebase of bug 13618 commit dcd1f5d48c758aee17b6c6f069c6146b42efe117 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)
Created attachment 102454 [details] [review] Bug 25069: Fix AddressFormat="fr" behavior Something went wrong during a rebase of bug 13618 commit dcd1f5d48c758aee17b6c6f069c6146b42efe117 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>
Created attachment 102695 [details] [review] Bug 25069: Fix AddressFormat="fr" behavior Something went wrong during a rebase of bug 13618 commit dcd1f5d48c758aee17b6c6f069c6146b42efe117 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>
Nice work everyone! Pushed to master for 20.05
does not apply to 19.11.x branch. please rebase if needed.
Created attachment 104349 [details] [review] [19.11.x version] Bug 25069: Fix AddressFormat="fr" behavior Something went wrong during a rebase of bug 13618 commit dcd1f5d48c758aee17b6c6f069c6146b42efe117 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)
Thanks for the rebase - backported to 19.11.x for 19.11.06
backported to 19.05.x for 19.05.11