From 4e8cbedafe4f81e67c58714b869cd825f52cd36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Tue, 14 Jun 2016 08:41:03 +0200 Subject: [PATCH] Bug 16730 - Use member-display-address-style*-includes in moremember-brief.tt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To test: - Apply patch - Create a new patron with the same first and last name as an existing patron. This should trigger a duplicate warning message. Click the "View existing record" link to trigger a pop-up window with a patron detail brief view. - Verify that the address information displays the same way as on the patron details screen (moremember.pl). - Change syspref 'AddressFormat' and verify that the address displays as appropriate. Signed-off-by: Frédéric Demians Works as described: AddressFormat is taken into account on 'view exiting record' dialog box. Signed-off-by: Kyle M Hall --- .../prog/en/modules/members/moremember-brief.tt | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index 33061fa..a2c0b12 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -1,3 +1,4 @@ +[% USE Koha %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Check duplicate patron @@ -16,17 +17,13 @@
[% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %] - -

[% streetnumber %] - [% IF ( roaddetails ) %] - [% roaddetails %] - [% END %] - [% address %]
- [% IF ( address2 ) %][% address2 %]
[% END %] - [% IF ( city ) %][% city %][% END %] - [% IF ( zipcode ) %][% zipcode %]
[% END %] - [% IF ( country ) %][% country %][% END %]

- +
+ [% IF Koha.Preference( 'AddressFormat' ) %] + [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] + [% ELSE %] + [% INCLUDE 'member-display-address-style-us.inc' %] + [% END %] +
    [% IF ( I ) %] -- 2.1.4