From db0b15ab37115bcfabac3c1c39cbbce235c6a41a Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 25 Feb 2020 20:40:57 +0000 Subject: [PATCH] Bug 14715: (follow-up) Keep results per page setting when selecting facets and sorting results Also adding missing filters ALSO ensuring you can switch back to library default on staff side Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/en/includes/facets.inc | 3 + .../prog/en/includes/page-numbers.inc | 11 ++-- .../prog/en/modules/catalogue/results.tt | 58 +++++++++---------- .../bootstrap/en/includes/opac-facets.inc | 3 + .../bootstrap/en/includes/page-numbers.inc | 11 ++-- .../bootstrap/en/modules/opac-results.tt | 4 +- 6 files changed, 49 insertions(+), 41 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index b4fb9ee241..243045b24a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -30,6 +30,9 @@ [% IF ( sort_by ) %] [% url = BLOCK %][% url | $raw %][% "&sort_by=" _ sort_by | url %][% END %] [% END %] + [% IF ( results_per_page ) %] + [% url = BLOCK %][% url | $raw %][% "&count=" _ results_per_page | url %][% END %] + [% END %] [% FOREACH facet IN facets_loo.facets %] [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,0) || facet.facet_label_value %][% END %] [% IF facets_loo.type_label_Language %][% SET facet.facet_label_value = Languages.GetByISOCode(lang,facet.facet_label_value) || facet.facet_label_value %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc index 03cf92d907..d873b89c06 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc @@ -1,19 +1,20 @@ +[% USE raw %] [% IF ( PAGE_NUMBERS ) %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index b694d8e646..a277a0c0b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -184,87 +184,87 @@ @@ -272,14 +272,14 @@ [% IF Koha.Preference('numSearchResultsDropdown') && Koha.Preference('SearchEngine') == "Zebra" %]