[Koha-patches] [PATCH] Fix for Bug 6364 - Display of item availability broken on OPAC detail screen

[Owen Leonard]

The markup for showing item availability has been moved to an include
file. The include lacked the scope declaration for the item results
loop. Adding the scope declaration to the include file means it can't
be used by other template unless within the same scope, but I'm not
aware of a better way to do it given the number of variables in use.
---
 .../opac-tmpl/prog/en/includes/item-status.inc     |   36 ++++++++++----------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
index fcfe120..36f9bb8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
@@ -1,32 +1,32 @@
-[% IF ( datedue ) %]
+[% IF ( ITEM_RESULT.datedue ) %]
     [% IF ( OPACShowCheckoutName ) %]
-        Checked out to [% cardnumber %] [% firstname %] [% surname %]
+        Checked out to [% ITEM_RESULT.cardnumber %] [% ITEM_RESULT.firstname %] [% ITEM_RESULT.surname %]
     [% ELSE %]
         Checked out
     [% END %]
-[% ELSIF ( transfertwhen ) %]
-    In transit from [% transfertfrom %]
-    to [% transfertto %] since [% transfertwhen %]
-[% ELSIF ( waiting ) %]
+[% ELSIF ( ITEM_RESULT.transfertwhen ) %]
+    In transit from [% ITEM_RESULT.transfertfrom %]
+    to [% ITEM_RESULT.transfertto %] since [% ITEM_RESULT.transfertwhen %]
+[% ELSIF ( ITEM_RESULT.waiting ) %]
     On hold
-[% ELSIF ( wthdrawn ) %]
+[% ELSIF ( ITEM_RESULT.wthdrawn ) %]
     Item withdrawn
-[% ELSIF ( itemlost ) %]
-    [% IF ( lostimageurl ) %]
-        <img src="[% lostimageurl %]" alt="[% lostimagelabel %]" title="[% lostimagelabel %]">
+[% ELSIF ( ITEM_RESULT.itemlost ) %]
+    [% IF ( ITEM_RESULT.lostimageurl ) %]
+        <img src="[% ITEM_RESULT.lostimageurl %]" alt="[% ITEM_RESULT.lostimagelabel %]" title="[% ITEM_RESULT.lostimagelabel %]">
     [% ELSE %]
         Item lost
     [% END %]
-[% ELSIF ( itemnotforloan ) %]
-    [% IF ( notforloanvalue ) %]
-        [% notforloanvalue %] [% IF ( restrictedopac ) %]<span class="restricted">([% restrictedopac %])</span>[% END %]
+[% ELSIF ( ITEM_RESULT.itemnotforloan ) %]
+    [% IF ( ITEM_RESULT.notforloanvalue ) %]
+        [% ITEM_RESULT.notforloanvalue %] [% IF ( ITEM_RESULT.restrictedopac ) %]<span class="restricted">([% ITEM_RESULT.restrictedopac %])</span>[% END %]
     [% ELSE %]
-        Not for loan [% IF ( restrictedopac ) %]<span class="restricted">([% restrictedopac %])</span>[% END %]
+        Not for loan [% IF ( ITEM_RESULT.restrictedopac ) %]<span class="restricted">([% ITEM_RESULT.restrictedopac %])</span>[% END %]
     [% END %]
-[% ELSIF ( notforloan_per_itemtype ) %]
-    Not for loan [% IF ( restrictedopac ) %]<span class="restricted">([% restrictedopac %])</span>[% END %]
-[% ELSIF ( damaged ) %]
+[% ELSIF ( ITEM_RESULT.notforloan_per_itemtype ) %]
+    Not for loan [% IF ( ITEM_RESULT.restrictedopac ) %]<span class="restricted">([% ITEM_RESULT.restrictedopac %])</span>[% END %]
+[% ELSIF ( ITEM_RESULT.damaged ) %]
     Item damaged
 [% ELSE %]
-    Available [% IF ( restrictedopac ) %]<span class="restricted">([% restrictedopac %])</span>[% END %]
+    Available [% IF ( ITEM_RESULT.restrictedopac ) %]<span class="restricted">([% ITEM_RESULT.restrictedopac %])</span>[% END %]
 [% END %]
-- 
1.7.3