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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt (-1 / +1 lines)
Lines 165-171 Link Here
165
                    if (!start_with) return "";
165
                    if (!start_with) return "";
166
                    return { "like": start_with + "%" }
166
                    return { "like": start_with + "%" }
167
                },
167
                },
168
                "-and": function(){
168
                "-or": function(){
169
                    let filter = $("#searchmember_filter").val();
169
                    let filter = $("#searchmember_filter").val();
170
                    if (!filter) return "";
170
                    if (!filter) return "";
171
                    [% SET search_fields = Koha.Preference('DefaultPatronSearchFields') || 'surname,firstname,othernames,cardnumber,userid' %]
171
                    [% SET search_fields = Koha.Preference('DefaultPatronSearchFields') || 'surname,firstname,othernames,cardnumber,userid' %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-10 / +1 lines)
Lines 610-624 jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { Link Here
610
                                            k = f; v = default_filters[f];
610
                                            k = f; v = default_filters[f];
611
                                        }
611
                                        }
612
612
613
                                        // Pass to -or if you want a separate OR clause
613
                                        additional_filters[k] = v;
614
                                        // It's not the usual DBIC notation!
615
                                        if ( f == '-or' ) {
616
                                            if (v) or_query_parameters.push(v)
617
                                        } else if ( f == '-and' ) {
618
                                            if (v) and_query_parameters.push(v)
619
                                        } else if ( v ) {
620
                                            additional_filters[k] = v;
621
                                        }
622
                                    }
614
                                    }
623
                                    if ( Object.keys(additional_filters).length ) {
615
                                    if ( Object.keys(additional_filters).length ) {
624
                                        and_query_parameters.push(additional_filters);
616
                                        and_query_parameters.push(additional_filters);
625
- 

Return to bug 30055