Bugzilla – Attachment 132631 Details for
Bug 30055
Rewrite some of the patron searches to make them use the REST API routes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30055: Restore DefaultPatronSearchFields and fix extended attrs search
Bug-30055-Restore-DefaultPatronSearchFields-and-fi.patch (text/plain), 3.62 KB, created by
Séverine Queune
on 2022-03-30 14:05:01 UTC
(
hide
)
Description:
Bug 30055: Restore DefaultPatronSearchFields and fix extended attrs search
Filename:
MIME Type:
Creator:
Séverine Queune
Created:
2022-03-30 14:05:01 UTC
Size:
3.62 KB
patch
obsolete
>From b50ac4b1d6c5b853192303aaa95c787495f419e0 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 11 Feb 2022 14:49:51 +0100 >Subject: [PATCH] Bug 30055: Restore DefaultPatronSearchFields and fix extended > attrs search >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >We lost the DefaultPatronSearchFields behaviour, we don't want to search >on all data but only DefaultPatronSearchFields > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> > >Signed-off-by: Séverine Queune <severine.queune@bulac.fr> >--- > .../prog/en/modules/members/search.tt | 16 +++++++++------- > koha-tmpl/intranet-tmpl/prog/js/datatables.js | 2 ++ > 2 files changed, 11 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >index c1b16a8d22..2fe0fea462 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >@@ -165,20 +165,22 @@ > if (!start_with) return ""; > return { "like": start_with + "%" } > }, >- [% IF Koha.Preference('ExtendedPatronAttributes') %] >- "-or": function(){ >+ "-and": function(){ > let filter = $("#searchmember_filter").val(); > if (!filter) return ""; >+ [% SET search_fields = Koha.Preference('DefaultPatronSearchFields') || 'surname,firstname,othernames,cardnumber,userid' %] > return [ >+ [% FOR search_field IN search_fields.split(',') %] >+ {"me.[% search_field %]":{"like":"%"+filter+"%"}}, >+ [% END %] >+ [% IF Koha.Preference('ExtendedPatronAttributes') %] > { >- "extended_attributes.value": { "like": "%" + filter + "%" } >- }, >- { >+ "extended_attributes.value": { "like": "%" + filter + "%" }, > "extended_attributes.code": extended_attribute_types > } >+ [% END %] > ]; > }, >- [% END %] > }; > patrons_table = $("#memberresultst").kohaTable({ > "ajax": { >@@ -344,7 +346,7 @@ > table_dt.column([% loop.count - 1 %]).search(category_id); > [% END %] > [% END %] >- table_dt.search($("#searchmember_filter").val()); >+ table_dt.search(""); > table_dt.draw(); > return false; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js >index ffeea60161..077af2ca87 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js >@@ -618,6 +618,8 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { > // It's not the usual DBIC notation! > if ( f == '-or' ) { > if (v) or_query_parameters.push(v) >+ } else if ( f == '-and' ) { >+ if (v) and_query_parameters.push(v) > } else if ( v ) { > additional_filters[k] = v; > } >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30055
:
130364
|
130365
|
130366
|
130367
|
130368
|
130369
|
130370
|
130371
|
130372
|
130385
|
130386
|
130387
|
130388
|
130389
|
130390
|
130391
|
130392
|
130393
|
130394
|
130395
|
130457
|
130487
|
130488
|
130491
|
130507
|
130511
|
130629
|
130630
|
130671
|
130672
|
130701
|
130702
|
130704
|
130716
|
130717
|
131829
|
132168
|
132419
|
132420
|
132421
|
132422
|
132423
|
132424
|
132425
|
132426
|
132427
|
132428
|
132429
|
132430
|
132431
|
132432
|
132433
|
132434
|
132435
|
132436
|
132437
|
132438
|
132439
|
132440
|
132441
|
132450
|
132451
|
132452
|
132453
|
132454
|
132455
|
132456
|
132457
|
132458
|
132459
|
132460
|
132461
|
132462
|
132463
|
132464
|
132465
|
132466
|
132467
|
132468
|
132469
|
132470
|
132471
|
132472
|
132473
|
132539
|
132616
|
132617
|
132618
|
132619
|
132620
|
132621
|
132622
|
132623
|
132624
|
132625
|
132627
|
132628
|
132629
|
132630
|
132631
|
132632
|
132633
|
132634
|
132635
|
132636
|
132637
|
132638
|
132639
|
132640
|
132641
|
132664
|
132665
|
132666
|
132667
|
132668
|
132669
|
132670
|
132671
|
132672
|
132673
|
132674
|
132675
|
132676
|
132677
|
132678
|
132679
|
132680
|
132681
|
132682
|
132683
|
132684
|
132685
|
132686
|
132687
|
132688