Attachment 82632 Details for Bug 21878 – Bug 21878: (follow-up) Fix a few uri filter in facets

[patch] Bug 21878: (follow-up) Fix a few uri filter in facets

Bug-21878-follow-up-Fix-a-few-uri-filter-in-facets.patch (text/plain), 3.76 KB, created by Marcel de Rooy on 2018-11-26 09:51:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2018-11-26 09:51:07 UTC

Size: 3.76 KB

patch

obsolete

>From 2009aaf87daf450833d1698d018ead68ac05d940 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Mon, 26 Nov 2018 10:30:12 +0100
>Subject: [PATCH] Bug 21878: (follow-up) Fix a few uri filter in facets
>Content-Type: text/plain; charset=utf-8
>
>We need to adjust a few query_cgi | uri filters here too.
>Note that sort_by should be filtered by uri, not url.
>
>Similar change on staff side.
>
>Test plan:
>Toggle Show all items/Limit available items.
>Check: git grep -l "query_cgi | uri"
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc       | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>index 4d2e34d..e3795e7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>@@ -5,7 +5,7 @@
> <div id="search-facets">
> <h4>Refine your search</h4>
> <ul>
>-    <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | uri %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | html %][% limit_cgi | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]&amp;limit=available">Limit to currently available items</a>[% END %]</li></ul>
>+    <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | url %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | url %][% limit_cgi | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %]&amp;limit=available">Limit to currently available items</a>[% END %]</li></ul>
> 	[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])</li>[% END %]
> 	</li>
> 
>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 6102b54..9ca89a6 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>@@ -8,9 +8,9 @@
>                 <ul>
>                     <li>
>                         [% IF ( available ) %]
>-                            <strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]">Show all items</a>
>+                            <strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |uri %][% END %]">Show all items</a>
>                         [% ELSE %]
>-                            <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi |url %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %]&amp;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 ) %]&amp;sort_by=[% sort_by |uri %][% END %]&amp;limit=available">Limit to currently available items.</a>
>                         [% END %]
>                     </li>
>                 </ul>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 21878: 82617 | 82630 | 82631 | 82632 | 82643 | 82644 | 82645 | 82646