@@ -, +, @@ option broken with AJAX circ --- koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 28 ++++++++++++++----------- 1 file changed, 16 insertions(+), 12 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js @@ -281,7 +281,7 @@ $(document).ready(function() { if ( oObj.can_renew ) { // Do nothing } else if ( oObj.can_renew_error == "on_reserve" ) { - content += "" + content += "" + "" + ON_HOLD + "" + ""; @@ -324,18 +324,22 @@ $(document).ready(function() { span_class = "renewals-allowed"; } - if ( oObj.renewals_remaining && oObj.onsite_checkout == 0 ) { - content += "" - + "" - + ""; + var can_force_renew = ( oObj.onsite_checkout == 0 ) && ( oObj.can_renew_error != "on_reserve" ); + var can_renew = ( oObj.renewals_remaining > 0 && !oObj.can_renew_error ); + if ( oObj.onsite_checkout == 0 ) { + if ( can_renew || can_force_renew ) { + content += "" + + "" + + ""; - content += "(" - + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed ) - + ")"; + content += "(" + + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed ) + + ")"; + } } content += ""; --