From c3a7ff0175db1eca8658515987fb957ed3c4c454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?= <f.demians@tamil.fr> Date: Tue, 26 Nov 2013 10:16:41 +0100 Subject: [PATCH] [PASSED QA] Bug 11277 Bootstrap theme facets doesn't work properly Two errors: 1. When selecting 'show more' above a facet, the advanced search page is displayed. 2. When restricting search on a library facet, all the biblio records of this library are returned. The patch fixes the way URL are encoded with TT filter. See that: http://search.cpan.org/~abw/Template-Toolkit-2.25/lib/Template/Manual/Filters.pod#url Signed-off-by: Liz Rea <liz@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Patch works nicely. Tests done: - 'More' link on facets redirects to advanced search before applying the patch. After appyling the link works correctly. - In my tests, the facet links themselves worked nicely, limiting the search as expected. - Availability search works ok for me with patch applied. - Also made sure to click on some links containing diacricits (German umlauts). --- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc index dabb207..5669ce1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc @@ -6,9 +6,9 @@ <ul> <li> [% IF ( available ) %] - Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi_not_availablity %][% IF ( sort_by ) %]&sort_by=[% sort_by |uri %][% END %]">Show all items</a> + Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |url %][% limit_cgi_not_availablity %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Show all items</a> [% ELSE %] - <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %][% IF ( sort_by ) %]&sort_by=[% sort_by |uri %][% END %]&limit=available">Limit to currently available items.</a> + <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |url %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">Limit to currently available items.</a> [% END %] </li> </ul> @@ -31,7 +31,7 @@ <ul> [% FOREACH facet IN facets_loo.facets %] <li> - <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %][% IF ( sort_by ) %]&sort_by=[% sort_by |uri %][% END %]&limit=[% facet.type_link_value |uri %]:[% facet.facet_link_value |uri %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a> + <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |url %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=[% facet.type_link_value |url %]:[% facet.facet_link_value |url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a> [% IF ( displayFacetCount ) %] ([% facet.facet_count %]) [% END %] @@ -39,8 +39,8 @@ [% END %] [% IF ( facets_loo.expandable ) %] <li class="showmore"> - <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %][% IF ( sort_by ) %]&sort_by=[% sort_by |uri %][% END %][% IF ( offset ) %] - &offset=[% offset |uri %][% END %]&expand=[% facets_loo.expand |uri %]#[% facets_loo.type_id |uri %]">Show more</a> + <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi |url %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %][% IF ( offset ) %] + &offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a> </li> [% END %] </ul> -- 1.8.3.2