From 0e0a2e74b2cc1037c04fadad8ef22075a1883448 Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Thu, 13 Mar 2008 17:18:06 -0500
Subject: [PATCH] removed use of TMPL_IF EXPR in circulation.tmpl

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 circ/circulation.pl                                       | 4 +++-
 .../intranet-tmpl/prog/en/modules/circ/circulation.tmpl   | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index fcaf8edbdb..12a162f80b 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -434,9 +434,11 @@ if ($borrower) {
 						$it->{'itemnumber'}, $borrower->{'borrowernumber'}
 		);
 		$it->{'charge'} = sprintf("%.2f", $it->{'charge'});
-        ($it->{'can_renew'}, $it->{'can_renew_error'}) = CanBookBeRenewed( 
+        my $can_renew_error;
+        ($it->{'can_renew'}, $can_renew_error) = CanBookBeRenewed( 
 						$borrower->{'borrowernumber'},$it->{'itemnumber'}
 		);
+        $it->{"renew_error_${can_renew_error}"} = 1 if defined $can_renew_error;
 		my ($restype, $reserves) = CheckReserves($it->{'itemnumber'});
 		($restype) and $it->{'can_renew'} = 0;
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index e5c3681a9e..bb8ea3d95c 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -412,10 +412,10 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
         <!-- /TMPL_IF -->
 		<!-- TMPL_ELSE -->
-		    <!-- TMPL_IF EXPR="can_renew_error eq 'on_reserve'" -->
+		    <!-- TMPL_IF NAME="renew_error_on_reserve" -->
 			    On Hold
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF EXPR="can_renew_error eq 'too_many'" -->
+			<!-- TMPL_IF NAME="renew_error_too_many" -->
 			    Too Many Renewals
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_IF -->
@@ -461,10 +461,10 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
         <!-- /TMPL_IF -->
 		<!-- TMPL_ELSE -->
-		    <!-- TMPL_IF EXPR="can_renew_error eq 'on_reserve'" -->
+		    <!-- TMPL_IF NAME="renew_error_on_reserve" -->
 			    On Hold
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF EXPR="can_renew_error eq 'too_many'" -->
+			<!-- TMPL_IF NAME="renew_error_too_many" -->
 			    Too Many Renewals
 			<!-- /TMPL_IF -->
 			
-- 
2.39.5