From fb440bb8fac8f6820c3db42fd0849858ed3df213 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 25 Aug 2015 14:57:30 +0100 Subject: [PATCH] Bug 14544: Do not use shelf as a variable loop Otherwise the shelf variable send from the pl script is overwrite --- .../prog/en/modules/catalogue/detail.tt | 8 +++---- .../prog/en/modules/catalogue/results.tt | 12 +++++----- .../prog/en/modules/virtualshelves/shelves.tt | 12 +++++----- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 8 +++---- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 12 +++++----- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 28 +++++++++++----------- 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index ac1d878..20b6615 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -358,8 +358,8 @@ function verify_images() { [% IF shelves %] Lists that include this title: - [% FOREACH shelf IN shelves %] - [% shelf.shelfname %] + [% FOREACH s IN shelves %] + [% s.shelfname %] [% IF ( loop.last ) %][% ELSE %]|[% END %] [% END %] @@ -523,8 +523,8 @@ function verify_images() { [% IF shelves %]
  • Lists that include this title:
  • 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 e0b3beb..0a4b2cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -96,9 +96,9 @@ $('#sort_by').change(function() { [% IF some_private_shelves.count %] param1 += ""; [% SET number_of_private_shelves = 0 %] - [% FOREACH shelf IN some_private_shelves %] - [% IF shelfnumber != shelf.shelfnumber %] - param1 += ""; [% SET number_of_public_shelves = 0 %] - [% FOREACH shelf IN some_public_shelves %] - [% IF shelfnumber != shelf.shelfnumber %] - param1 += ""; [% SET number_of_private_shelves = 0 %] - [% FOREACH shelf IN some_private_shelves %] - [% IF shelfnumber != shelf.shelfnumber %] - param1 += ""; [% SET number_of_public_shelves = 0 %] - [% FOREACH shelf IN some_public_shelves %] - [% IF shelfnumber != shelf.shelfnumber %] - param1 += ""; [% SET number_of_private_shelves = 0 %] - [% FOREACH shelf IN some_private_shelves %] - [% IF shelfnumber != shelf.shelfnumber %] - param1 += ""; [% SET number_of_public_shelves = 0 %] - [% FOREACH shelf IN some_public_shelves %] - [% IF shelfnumber != shelf.shelfnumber %] - param1 += "