From 1c6f75cb76eee55d62e15fa323e9bad85ca29c89 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 13 Jun 2017 04:50:11 +0000 Subject: [PATCH] Bug 14715: [FOLLOW-UP] Fixing qa-tools issues and merge conflicts --- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 18 +++++++++--------- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) 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 3de2923..7bbdc64 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -109,9 +109,10 @@ $('#results_per_page').change(function() { [% IF ( intranetbookbag ) %] param1 += ""; - [% SET number_of_private_shelves = 0 %] [% FOREACH s IN add_to_some_private_shelves %] [% IF shelfnumber != s.shelfnumber %] param1 += ""; - [% SET number_of_public_shelves = 0 %] [% FOREACH s IN add_to_some_public_shelves %] [% IF shelfnumber != s.shelfnumber %] param1 += ""; - [% SET number_of_private_shelves = 0 %] [% FOREACH s IN add_to_some_private_shelves %] [% IF shelfnumber != s.shelfnumber %] param1 += ""; - [% SET number_of_public_shelves = 0 %] [% FOREACH s IN add_to_some_public_shelves %] [% IF shelfnumber != s.shelfnumber %] param1 += "