diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt index 822264099c..759b7308f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt @@ -44,5 +44,5 @@ [%~ IF data.streettype %][% address = address _ AuthorisedValues.GetByCode( 'ROADTYPE', data.streettype ) _ ' ' %][% END %] [%~ IF data.address %][% address = address _ data.address _ ' ' %][% END %] [%~ IF data.address2 %][% address = address _ data.address2 _ ' ' %][% END %] -[%~ To.json( address ) ~%] +[%~ address | html | $To ~%] [% END %] diff --git a/t/db_dependent/selenium/patrons_search.t b/t/db_dependent/selenium/patrons_search.t index 8ea5f869ca..5a27e2f116 100644 --- a/t/db_dependent/selenium/patrons_search.t +++ b/t/db_dependent/selenium/patrons_search.t @@ -40,13 +40,14 @@ my $builder = t::lib::TestBuilder->new; our @cleanup; subtest 'Search patrons' => sub { - plan tests => 4; + plan tests => 5; my @patrons; my $borrowernotes = q|just 'a" note \123 ❤|; my $borrowernotes_displayed = q|just 'a" note \123 ❤|; my $branchname = q|just 'another" library \123 ❤|; my $firstname = q|fir's"tname \123 ❤|; + my $address = q|add'res"s \123 ❤|; my $patron_category = $builder->build_object( { class => 'Koha::Patron::Categories', category_type => 'A' } ); my $library = $builder->build_object( @@ -63,6 +64,7 @@ subtest 'Search patrons' => sub { categorycode => $patron_category->categorycode, branchcode => $library->branchcode, borrowernotes => $borrowernotes, + address => $address, } } ); @@ -78,6 +80,9 @@ subtest 'Search patrons' => sub { like ($td[2]->get_text, qr[\Q$firstname\E], 'Column "Name" should be the 3rd and contain the firstname correctly filtered' ); + like ($td[2]->get_text, qr[\Q$address\E], + 'Column "Name" should be the 3rd and contain the address correctly filtered' + ); is( $td[5]->get_text, $branchname, 'Column "Library" should be the 6th and contain the html tags - they have been html filtered' );