@@ -, +, @@
before escapeHtml call
---
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
@@ -297,7 +297,12 @@ $(document).ready(function() {
},
{
"mDataProp": function ( oObj ) {
- return oObj.location.escapeHtml();
+ return ( oObj.collection ? oObj.collection.escapeHtml() : '' );
+ }
+ },
+ {
+ "mDataProp": function ( oObj ) {
+ return ( oObj.location ? oObj.location.escapeHtml() : '' );
}
},
{
@@ -313,7 +318,7 @@ $(document).ready(function() {
},
{
"mDataProp": function ( oObj ) {
- return oObj.itemcallnumber.escapeHtml();
+ return ( oObj.itemcallnumber ? oObj.itemcallnumber.escapeHtml() : '' );
}
},
{
@@ -633,7 +638,12 @@ $(document).ready(function() {
},
{
"mDataProp": function ( oObj ) {
- return oObj.location.escapeHtml();
+ return ( oObj.collection ? oObj.collection.escapeHtml() : '' );
+ }
+ },
+ {
+ "mDataProp": function ( oObj ) {
+ return ( oObj.location ? oObj.location.escapeHtml() : '' );
}
},
{ "mDataProp": "issuedate_formatted" },
@@ -644,7 +654,7 @@ $(document).ready(function() {
},
{
"mDataProp": function ( oObj ) {
- return oObj.itemcallnumber.escapeHtml();
+ return ( oObj.itemcallnumber ? oObj.itemcallnumber.escapeHtml() : '' );
}
},
{
--