Bugzilla – Attachment 130717 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: Force exact match for dropdown
Bug-30055-Force-exact-match-for-dropdown.patch (text/plain), 4.35 KB, created by
Jonathan Druart
on 2022-02-17 10:50:36 UTC
(
hide
)
Description:
Bug 30055: Force exact match for dropdown
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-02-17 10:50:36 UTC
Size:
4.35 KB
patch
obsolete
>From 166e62216b372e55722d9bdfeb52fa401ff36c50 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 17 Feb 2022 09:26:02 +0100 >Subject: [PATCH] Bug 30055: Force exact match for dropdown > >For libraries and categories we need to use an exact match. >--- > .../prog/en/modules/members/search.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/js/datatables.js | 24 ++++++++++++++----- > 2 files changed, 20 insertions(+), 8 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 8f14421f9e6..3b79667d9dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt >@@ -344,11 +344,11 @@ > [% CASE 'branch' %] > let library_id = $("#branchcode_filter").val(); > patrons_table.find('thead tr:eq(1) th[data-filter="libraries"] select').val(library_id); >- table_dt.column([% loop.count - 1 %]).search(library_id); >+ table_dt.column([% loop.count - 1 %]).search(library_id ? '^'+library_id+'$' : ''); > [% CASE 'category' %] > let category_id = $("#categorycode_filter").val(); > patrons_table.find('thead tr:eq(1) th[data-filter="categories"] select').val(category_id); >- table_dt.column([% loop.count - 1 %]).search(category_id); >+ table_dt.column([% loop.count - 1 %]).search(category_id ? '^'+category_id+'$' : ''); > [% END %] > [% END %] > table_dt.search(""); >diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js >index f369fbebfc6..4e19cc93905 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js >@@ -562,9 +562,14 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { > for (var i=0;i<attributes.length;i++){ > var part = {}; > var attr = attributes[i]; >- part[!attr.includes('.')?'me.'+attr:attr] = options.criteria === 'exact' >+ let criteria = options.criteria; >+ if ( value.match(/^\^(.*)\$$/) ) { >+ value = value.replace(/^\^/, '').replace(/\$$/, ''); >+ criteria = "exact"; >+ } >+ part[!attr.includes('.')?'me.'+attr:attr] = criteria === 'exact' > ? value >- : {like: (['contains', 'ends_with'].indexOf(options.criteria) !== -1?'%':'') + value + (['contains', 'starts_with'].indexOf(options.criteria) !== -1?'%':'')}; >+ : {like: (['contains', 'ends_with'].indexOf(criteria) !== -1?'%':'') + value + (['contains', 'starts_with'].indexOf(criteria) !== -1?'%':'')}; > parts.push(part); > } > return parts; >@@ -840,10 +845,17 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { > > $( input_type, this ).on( 'keyup change', function () { > if ( table_dt.column(i).search() !== this.value ) { >- table_dt >- .column(i) >- .search( this.value ) >- .draw(); >+ if ( input_type == "input" ) { >+ table_dt >+ .column(i) >+ .search( this.value ) >+ .draw(); >+ } else { >+ table_dt >+ .column(i) >+ .search( '^'+this.value+'$', true, false ) >+ .draw(); >+ } > } > } ); > } else { >-- >2.25.1
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