From 63124512ef56a0a9b5f55117983ddd102aee962a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 27 Jul 2020 12:37:42 +0200 Subject: [PATCH] Bug 25758: Fix handle of checkouts without holds --- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 8 ++++---- svc/checkouts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index 0481f1b786..531696881a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -517,9 +517,9 @@ $(document).ready(function() { } var can_force_renew = ( oObj.onsite_checkout == 0 ) && - ( !oObj.can_renew_error.includes("on_reserve") || (oObj.can_renew_error.includes("on_reserve") && AllowRenewalOnHoldOverride)) + ( !oObj.can_renew_error || !oObj.can_renew_error.includes("on_reserve") || (oObj.can_renew_error.includes("on_reserve") && AllowRenewalOnHoldOverride)) ? true : false; - var can_renew = ( oObj.renewals_remaining > 0 && !oObj.can_renew_error.length ); + var can_renew = ( oObj.renewals_remaining > 0 && ( !oObj.can_renew_error || !oObj.can_renew_error.length ) ); content += ""; if ( can_renew || can_force_renew ) { content += "" + oObj.renewals_count + ""; @@ -528,7 +528,7 @@ $(document).ready(function() { if ( oObj.date_due_overdue && can_renew ) { content += "checked='checked' "; } - if (oObj.can_renew_error.includes("on_reserve")) { + if (oObj.can_renew_error && oObj.can_renew_error.includes("on_reserve")) { content += "data-on-reserve "; } content += "class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>" @@ -550,7 +550,7 @@ $(document).ready(function() { "bSortable": false, "bVisible": AllowCirculate ? true : false, "mDataProp": function ( oObj ) { - if ( oObj.can_renew_error.includes("on_reserve") ) { + if ( oObj.can_renew_error && oObj.can_renew_error.includes("on_reserve") ) { return "" + ON_HOLD + ""; } else { return ""; diff --git a/svc/checkouts b/svc/checkouts index edcb888738..0638fc4cf4 100755 --- a/svc/checkouts +++ b/svc/checkouts @@ -149,7 +149,7 @@ while ( my $c = $sth->fetchrow_hashref() ) { my ( $can_renew, $can_renew_error ) = CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} ); my $can_renew_date = - @$can_renew_error && $can_renew_error->[0] eq 'too_soon' + $can_renew_error && $can_renew_error->[0] eq 'too_soon' ? output_pref( { dt => GetSoonestRenewDate( $c->{borrowernumber}, $c->{itemnumber} ), -- 2.20.1