Lines 527-532
jQuery.fn.dataTable.ext.errMode = function(settings, note, message) {
Link Here
|
527 |
if(options.embed) { |
527 |
if(options.embed) { |
528 |
xhr.setRequestHeader('x-koha-embed', Array.isArray(options.embed)?options.embed.join(','):options.embed); |
528 |
xhr.setRequestHeader('x-koha-embed', Array.isArray(options.embed)?options.embed.join(','):options.embed); |
529 |
} |
529 |
} |
|
|
530 |
if(options.header_filter && options.query_parameters) { |
531 |
xhr.setRequestHeader('x-koha-query', options.query_parameters); |
532 |
delete options.query_parameters; |
533 |
} |
530 |
}, |
534 |
}, |
531 |
'dataFilter': function(data, type) { |
535 |
'dataFilter': function(data, type) { |
532 |
var json = {data: JSON.parse(data)}; |
536 |
var json = {data: JSON.parse(data)}; |
Lines 547-554
jQuery.fn.dataTable.ext.errMode = function(settings, note, message) {
Link Here
|
547 |
|
551 |
|
548 |
var filter = data.search.value; |
552 |
var filter = data.search.value; |
549 |
if (filter != '') { |
553 |
if (filter != '') { |
550 |
dataSet.name = filter; |
554 |
var query_parameters = settings.aoColumns |
|
|
555 |
.filter(function(col) { |
556 |
return col.bSearchable && typeof col.data == 'string' |
557 |
}) |
558 |
.map(function(col) { |
559 |
var part = {}; |
560 |
part[!col.data.includes('.')?'me.'+col.data:col.data] = {like: filter+'%'}; |
561 |
return part; |
562 |
}); |
563 |
|
564 |
if(query_parameters.length) { |
565 |
query_parameters = JSON.stringify(query_parameters.length === 1?query_parameters[0]:query_parameters); |
566 |
if(options.header_filter) { |
567 |
options.query_parameters = query_parameters; |
568 |
} else { |
569 |
dataSet.q = query_parameters; |
570 |
} |
571 |
} |
572 |
|
551 |
dataSet._match = 'starts_with'; |
573 |
dataSet._match = 'starts_with'; |
|
|
574 |
} else { |
575 |
delete options.query_parameters; |
552 |
} |
576 |
} |
553 |
|
577 |
|
554 |
if(options.columns) { |
578 |
if(options.columns) { |
Lines 557-563
jQuery.fn.dataTable.ext.errMode = function(settings, note, message) {
Link Here
|
557 |
var order_col = e.column; |
581 |
var order_col = e.column; |
558 |
var order_by = options.columns[order_col].data; |
582 |
var order_by = options.columns[order_col].data; |
559 |
var order_dir = e.dir == 'asc' ? '+' : '-'; |
583 |
var order_dir = e.dir == 'asc' ? '+' : '-'; |
560 |
dataSet._order_by = order_dir + order_by; |
584 |
dataSet._order_by = order_dir + (!order_by.includes('.')?'me.'+order_by:order_by); |
561 |
}); |
585 |
}); |
562 |
} |
586 |
} |
563 |
|
587 |
|
564 |
- |
|
|