From a65b039f598e8aa715e21a16eb5dbec9ad26e05a Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Mon, 4 Apr 2011 15:53:37 +1200 Subject: [PATCH] Bug 5917 : Fixing opac-detail.pl and detail.pl holding information --- .../prog/en/modules/catalogue/detail.tt | 24 +++++++++---------- .../opac-tmpl/prog/en/modules/opac-detail.tt | 12 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 9c9ed0b38a..158609b5fe 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -236,9 +236,9 @@ function verify_images() { [% FOREACH itemloo IN itemloop %] - [% IF ( itemloo.item_level_itypes ) %] + [% IF ( item_level_itypes ) %] - [% IF ( itemloo.noItemTypeImages ) %] + [% IF ( noItemTypeImages ) %] [% itemloo.description %] [% ELSE %] [% IF ( itemloo.imageurl ) %] @@ -248,9 +248,9 @@ function verify_images() { [% END %] [% END %] [% END %] - [% UNLESS ( itemloo.singlebranchmode ) %][% itemloo.branchname %] [% END %] + [% UNLESS ( singlebranchmode ) %][% itemloo.branchname %] [% END %] [% itemloo.homebranch %][% itemloo.location %] - [% IF ( itemloo.itemdata_ccode ) %][% itemloo.ccode %][% END %] + [% IF ( itemdata_ccode ) %][% itemloo.ccode %][% END %] [% IF ( itemloo.itemcallnumber ) %] [% itemloo.itemcallnumber %][% END %] @@ -258,7 +258,7 @@ function verify_images() { Checked out [% UNLESS ( itemloo.NOTSAMEBRANCH ) %] to - [% IF ( itemloo.hidepatronname ) %] + [% IF ( hidepatronname ) %] [% itemloo.cardnumber %] [% ELSE %] [% itemloo.firstname %] [% itemloo.surname %] @@ -315,8 +315,8 @@ function verify_images() { [% ELSE %] On hold [% END %] - [% IF ( itemloo.canreservefromotherbranches ) %]for - [% IF ( itemloo.hidepatronname ) %] + [% IF ( canreservefromotherbranches ) %]for + [% IF ( hidepatronname ) %] [% itemloo.Reservedcardnumber %] [% ELSE %] [% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %] @@ -341,24 +341,24 @@ function verify_images() { [% itemloo.datelastseen %] [% itemloo.barcode %] [% IF ( itemloo.volinfo ) %] - [% IF ( itemloo.itemdata_enumchron ) %] + [% IF ( itemdata_enumchron ) %] [% IF ( itemloo.enumchron ) %] [% itemloo.enumchron %][% IF ( itemloo.serialseq ) %] -- [% END %] [% END %] [% END %] [% itemloo.serialseq %][% IF ( itemloo.publisheddate ) %] ([% itemloo.publisheddate %])[% END %] [% END %] - [% IF ( itemloo.itemdata_uri ) %] + [% IF ( itemdata_uri ) %] [% itemloo.uri %] [% END %] - [% IF ( itemloo.itemdata_copynumber ) %] + [% IF ( itemdata_copynumber ) %] [% itemloo.copynumber %] [% END %] - [% IF ( itemloo.itemdata_itemnotes ) %]
[% itemloo.itemnotes %]
[% END %] + [% IF ( itemdata_itemnotes ) %]
[% itemloo.itemnotes %]
[% END %] [% IF ( itemloo.type ) %] Fix Itemtype [% END %] - [% IF ( itemloo.SpineLabelShowPrintOnBibDetails ) %] + [% IF ( SpineLabelShowPrintOnBibDetails ) %] Print Label [% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt index 8588af98aa..db9a489ed9 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt @@ -400,15 +400,15 @@ YAHOO.util.Event.onContentReady("furtherm", function () { Date Due [% FOREACH ITEM_RESULT IN ITEM_RESULTS %] - [% IF ( ITEM_RESULT.item_level_itypes ) %][% UNLESS ( ITEM_RESULT.noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %][% ITEM_RESULT.description %][% END %][% END %] [% ITEM_RESULT.description %][% END %] + [% IF ( item_level_itypes ) %][% UNLESS ( ITEM_RESULT.noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %][% ITEM_RESULT.description %][% END %][% END %] [% ITEM_RESULT.description %][% END %] [% UNLESS ( ITEM_RESULT.singleBranchMode ) %][% IF ( ITEM_RESULT.branchurl ) %][% ITEM_RESULT.branchname %][% ELSE %][% ITEM_RESULT.branchname %][% END %][% END %] [% ITEM_RESULT.location_description %] - [% IF ( ITEM_RESULT.itemdata_ccode ) %][% ITEM_RESULT.ccode %][% END %] + [% IF ( itemdata_ccode ) %][% ITEM_RESULT.ccode %][% END %] [% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( ITEM_RESULT.OPACShelfBrowser ) %] (Browse Shelf)[% END %][% END %] - [% IF ( ITEM_RESULT.itemdata_enumchron ) %][% ITEM_RESULT.enumchron %][% END %] - [% IF ( ITEM_RESULT.itemdata_uri ) %][% ITEM_RESULT.uri %][% END %] - [% IF ( ITEM_RESULT.itemdata_copynumber ) %][% ITEM_RESULT.copynumber %][% END %] + [% IF ( itemdata_enumchron ) %][% ITEM_RESULT.enumchron %][% END %] + [% IF ( itemdata_uri ) %][% ITEM_RESULT.uri %][% END %] + [% IF ( itemdata_copynumber ) %][% ITEM_RESULT.copynumber %][% END %] [% INCLUDE 'item-status.inc' %] - [% IF ( ITEM_RESULT.itemdata_itemnotes ) %][% ITEM_RESULT.itemnotes %][% END %] + [% IF ( itemdata_itemnotes ) %][% ITEM_RESULT.itemnotes %][% END %] [% ITEM_RESULT.datedue %] [% IF ( ITEM_RESULT.type ) %] Fix Itemtype -- 2.39.5