@@ -, +, @@ tab and Details tab) --- .../prog/en/modules/circ/circulation.tt | 1 + .../prog/en/modules/members/moremember.tt | 1 + koha-tmpl/intranet-tmpl/prog/js/holds.js | 73 ++++++++++++---------- 3 files changed, 43 insertions(+), 32 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -895,6 +895,7 @@ No patron matched [% message | html %] Priority Cancel? Suspend? + Status --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -764,6 +764,7 @@ Priority Delete? Suspend? + Status --- a/koha-tmpl/intranet-tmpl/prog/js/holds.js +++ a/koha-tmpl/intranet-tmpl/prog/js/holds.js @@ -53,37 +53,7 @@ $(document).ready(function() { { "mDataProp": function( oObj ) { var data = ""; - - if ( oObj.suspend == 1 ) { - data += "

" + HOLD_IS_SUSPENDED; - if ( oObj.suspend_until ) { - data += " " + UNTIL.format( oObj.suspend_until_formatted ); - } - data += "

"; - } - - if ( oObj.itemtype_limit ) { - data += NEXT_AVAILABLE_ITYPE.format( oObj.itemtype_limit ); - } - if ( oObj.barcode ) { - data += ""; - if ( oObj.found == "W" ) { - - if ( oObj.waiting_here ) { - data += ITEM_IS_WAITING_HERE; - } else { - data += ITEM_IS_WAITING; - data += " " + AT.format( oObj.waiting_at ); - } - - } else if ( oObj.transferred ) { - data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch, oObj.date_sent ); - } else if ( oObj.not_transferred ) { - data += NOT_TRANSFERRED_YET.format( oObj.not_transferred_by ); - } - data += ""; - data += " " + SUSPEND + ""; } } - } + }, + { + "mDataProp": function( oObj ) { + var data = ""; + if ( oObj.suspend != 1 && !oObj.itemtype_limit) { + data = _("Hold has been placed\n"); + } + + if ( oObj.suspend == 1 ) { + data += "

" + HOLD_IS_SUSPENDED; + if ( oObj.suspend_until ) { + data += " " + UNTIL.format( oObj.suspend_until_formatted ); + } + data += "

"; + } + + if ( oObj.itemtype_limit ) { + data += NEXT_AVAILABLE_ITYPE.format( oObj.itemtype_limit ); + } + + if ( oObj.barcode ) { + data += ""; + if ( oObj.found == "W" ) { + + if ( oObj.waiting_here ) { + data += ITEM_IS_WAITING_HERE; + } else { + data += ITEM_IS_WAITING; + data += " " + AT.format( oObj.waiting_at ); + } + + } else if ( oObj.transferred ) { + data += ITEM_IS_IN_TRANSIT.format( oObj.from_branch, oObj.date_sent ); + } else if ( oObj.not_transferred ) { + data += NOT_TRANSFERRED_YET.format( oObj.not_transferred_by ); + } + data += ""; + } + return data; + } + } ], "bPaginate": false, "bProcessing": true, --