Attachment #144450 for bug #32401

View | Details | Raw Unified | Return to bug 32401
Collapse All | Expand All

Lines 1651-1657 Note that permanent location is a code, and location may be an authval. Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 lines)
1651	"ajax": {	1651	"ajax": {
1652	"url": bundle_table_url	1652	"url": bundle_table_url
1653	},	1653	},
1654	"header_filter": false,
1655	"embed": [	1654	"embed": [
1656	"biblio",	1655	"biblio",
1657	"return_claim.patron"	1656	"return_claim.patron"




                                if(options.embed) {
                                    xhr.setRequestHeader('x-koha-embed', Array.isArray(options.embed)?options.embed.join(','):options.embed);
                                }
                                if(options.header_filter && options.query_parameters) {
                                    xhr.setRequestHeader('x-koha-query', options.query_parameters);
                                    delete options.query_parameters;
                                }
                            },
                            'dataFilter': function(data, type) {
                                var json = {data: JSON.parse(data)};


                                if(query_parameters.length) {
                                    query_parameters = JSON.stringify(query_parameters.length === 1?query_parameters[0]:{"-and": query_parameters});
                                    dataSet.q = query_parameters;
                                    delete options.query_parameters;
                                    } else {
                                        dataSet.q = query_parameters;
                                        delete options.query_parameters;
                                    }
                                } else {
                                    delete options.query_parameters;
                                }




                                if(options.embed) {
                                    xhr.setRequestHeader('x-koha-embed', Array.isArray(options.embed)?options.embed.join(','):options.embed);
                                }
                                if(options.header_filter && options.query_parameters) {
                                    xhr.setRequestHeader('x-koha-query', options.query_parameters);
                                    delete options.query_parameters;
                                }
                            },
                            'dataFilter': function(data, type) {
                                var json = {data: JSON.parse(data)};


                                if(query_parameters.length) {
                                    query_parameters = JSON.stringify(query_parameters.length === 1?query_parameters[0]:query_parameters);
                                    dataSet.q = query_parameters;
                                    delete options.query_parameters;
                                    } else {
                                        dataSet.q = query_parameters;
                                        delete options.query_parameters;
                                    }
                                } else {
                                    delete options.query_parameters;
                                }
- 

Return to bug 32401

Lines 553-562 jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-10 / +2 lines)
553	if(options.embed) {	553	if(options.embed) {
554	xhr.setRequestHeader('x-koha-embed', Array.isArray(options.embed)?options.embed.join(','):options.embed);	554	xhr.setRequestHeader('x-koha-embed', Array.isArray(options.embed)?options.embed.join(','):options.embed);
555	}	555	}
556	if(options.header_filter && options.query_parameters) {
557	xhr.setRequestHeader('x-koha-query', options.query_parameters);
558	delete options.query_parameters;
559	}
560	},	556	},
561	'dataFilter': function(data, type) {	557	'dataFilter': function(data, type) {
562	var json = {data: JSON.parse(data)};	558	var json = {data: JSON.parse(data)};
Lines 666-677 jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { Link Here
666		662
667	if(query_parameters.length) {	663	if(query_parameters.length) {
668	query_parameters = JSON.stringify(query_parameters.length === 1?query_parameters[0]:{"-and": query_parameters});	664	query_parameters = JSON.stringify(query_parameters.length === 1?query_parameters[0]:{"-and": query_parameters});
669	if(options.header_filter) {	665	dataSet.q = query_parameters;
670	options.query_parameters = query_parameters;	666	delete options.query_parameters;
671	} else {
672	dataSet.q = query_parameters;
673	delete options.query_parameters;
674	}
675	} else {	667	} else {
676	delete options.query_parameters;	668	delete options.query_parameters;
677	}	669	}

Lines 141-150 $.fn.dataTable.ext.buttons.clearFilter = { Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js (-11 / +2 lines)
141	if(options.embed) {	141	if(options.embed) {
142	xhr.setRequestHeader('x-koha-embed', Array.isArray(options.embed)?options.embed.join(','):options.embed);	142	xhr.setRequestHeader('x-koha-embed', Array.isArray(options.embed)?options.embed.join(','):options.embed);
143	}	143	}
144	if(options.header_filter && options.query_parameters) {
145	xhr.setRequestHeader('x-koha-query', options.query_parameters);
146	delete options.query_parameters;
147	}
148	},	144	},
149	'dataFilter': function(data, type) {	145	'dataFilter': function(data, type) {
150	var json = {data: JSON.parse(data)};	146	var json = {data: JSON.parse(data)};
Lines 180-191 $.fn.dataTable.ext.buttons.clearFilter = { Link Here
180		176
181	if(query_parameters.length) {	177	if(query_parameters.length) {
182	query_parameters = JSON.stringify(query_parameters.length === 1?query_parameters[0]:query_parameters);	178	query_parameters = JSON.stringify(query_parameters.length === 1?query_parameters[0]:query_parameters);
183	if(options.header_filter) {	179	dataSet.q = query_parameters;
184	options.query_parameters = query_parameters;	180	delete options.query_parameters;
185	} else {
186	dataSet.q = query_parameters;
187	delete options.query_parameters;
188	}
189	} else {	181	} else {
190	delete options.query_parameters;	182	delete options.query_parameters;
191	}	183	}
192	-