Attachment 115821 Details for Bug 20212 – Bug 20212: Fix query for the global filter

[patch] Bug 20212: Fix query for the global filter

Bug-20212-Fix-query-for-the-global-filter.patch (text/plain), 3.02 KB, created by Tomás Cohen Arazi (tcohen) on 2021-01-26 14:12:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2021-01-26 14:12:32 UTC

Size: 3.02 KB

patch

obsolete

>From 146cf7b32be9c964b30cc49910245aca8ce308a2 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 13 Jan 2021 11:39:27 +0100
>Subject: [PATCH] Bug 20212: Fix query for the global filter
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> koha-tmpl/intranet-tmpl/prog/js/datatables.js | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js
>index 33a21d82872..24b1c2e534b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js
>@@ -564,13 +564,12 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) {
>                                 };
> 
> 
>-                                function build_query(col){
>+                                function build_query(col, value){
>                                     var parts = [];
>                                     var attributes = col.data.split(':');
>                                     for (var i=0;i<attributes.length;i++){
>                                         var part = {};
>                                         var attr = attributes[i];
>-                                        var value = data.columns[col.idx].search.value;
>                                         part[!attr.includes('.')?'me.'+attr:attr] = options.criteria === 'exact'
>                                             ? value
>                                             : {like: (['contains', 'ends_with'].indexOf(options.criteria) !== -1?'%':'') + value + (['contains', 'starts_with'].indexOf(options.criteria) !== -1?'%':'')};
>@@ -586,7 +585,8 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) {
>                                     return col.bSearchable && typeof col.data == 'string' && data.columns[col.idx].search.value != ''
>                                 })
>                                 .map(function(col) {
>-                                    return build_query(col)
>+                                    var value = data.columns[col.idx].search.value;
>+                                    return build_query(col, value)
>                                 })
>                                 .map(function r(e){
>                                     return ($.isArray(e) ? $.map(e, r) : e);
>@@ -598,7 +598,8 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) {
>                                     return col.bSearchable && typeof col.data == 'string' && data.columns[col.idx].search.value == '' && filter != ''
>                                 })
>                                 .map(function(col) {
>-                                    return build_query(col)
>+                                    var value = filter;
>+                                    return build_query(col, value)
>                                 })
>                                 .map(function r(e){
>                                     return ($.isArray(e) ? $.map(e, r) : e);
>-- 
>2.30.0

Actions: View | Diff | Splinter Review

Attachments on bug 20212: 97545 | 97546 | 97547 | 97629 | 97630 | 97633 | 97634 | 97635 | 97745 | 98226 | 98230 | 98241 | 99724 | 99725 | 99727 | 100142 | 100475 | 100476 | 100477 | 100478 | 100552 | 100553 | 100554 | 100555 | 100600 | 100601 | 100602 | 100603 | 100605 | 100606 | 100643 | 101320 | 103684 | 103685 | 103686 | 103687 | 103688 | 109861 | 109862 | 109863 | 109864 | 109866 | 109867 | 109868 | 109869 | 109870 | 109936 | 110229 | 110234 | 110478 | 110482 | 111568 | 111569 | 112310 | 112521 | 112522 | 112523 | 112524 | 112686 | 112695 | 112698 | 112699 | 112700 | 112702 | 112703 | 112704 | 112705 | 112706 | 112868 | 112882 | 112987 | 113278 | 113279 | 114607 | 114608 | 114609 | 114610 | 114611 | 114612 | 114613 | 114614 | 114615 | 114616 | 114617 | 114942 | 114953 | 114954 | 114956 | 114959 | 114963 | 115050 | 115056 | 115057 | 115060 | 115062 | 115107 | 115108 | 115109 | 115817 | 115818 | 115819 | 115820 | 115821 | 115822 | 115886 | 115887 | 115888 | 115889 | 115890 | 115891 | 115892 | 115893 | 115894 | 115895 | 115896 | 115897 | 115898 | 115899 | 115900 | 115901 | 115902 | 115903 | 115904 | 115905 | 115906 | 115920 | 115921 | 115940 | 115941 | 115943 | 115944 | 115945 | 115946 | 115947 | 115948 | 115949 | 115950 | 115951 | 115952 | 115953 | 115954 | 115955 | 115956 | 115957 | 115958 | 115959 | 115960 | 115961 | 115962 | 115963 | 115964 | 115965 | 116139