diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index 72301aaa86..a665360fb7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -925,7 +925,7 @@ $(document).ready(function() { "sClass": "return-claim-notes-td", "mDataProp": function ( oObj ) { return '' + oObj.notes + '' - + ''; + + ''; } }, { @@ -948,26 +948,27 @@ $(document).ready(function() { "mDataProp": function ( oObj ) { if ( ! oObj.resolution ) return ""; - let desc = '' + oObj.resolution_data.lib + ' on ' + oObj.resolved_on + ''; - if (oObj.resolved_by_data) desc += ' by ' + ( oObj.resolved_by_data.firstname || "" ) + ( oObj.resolved_by_data.surname || "" ) + ''; + let desc = '' + oObj.resolution_data.lib + ' ('; + if (oObj.resolved_by_data) desc += '' + ( oObj.resolved_by_data.firstname || "" ) + " " + ( oObj.resolved_by_data.surname || "" ) + ''; + desc += ', ' + oObj.resolved_on + ')'; return desc; } }, { "mDataProp": function ( oObj ) { let delete_html = oObj.resolved_on - ? '
  • Delete
  • ' + ? '
  • ' + __("Delete") + '
  • ' : ""; let resolve_html = ! oObj.resolution - ? '
  • Resolve
  • ' + ? '
  • ' + __("Resolve") + '
  • ' : ""; return '
    ' - + ' ' + ' ' @@ -1009,8 +1010,8 @@ $(document).ready(function() { ' ' + ' ' + '
    ' - + ' Update' - + ' Cancel' + + ' ' + __("Update") + '' + + ' ' + __("Cancel") + '' + '
    '; elt.hide(); $(editor).insertAfter( elt );