gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 26916: Show searchable patron attributes in patron search dropdown 

This patch adds attributes that have been marked searchable to the patron
search dropdowns

To test:
1 - Define some new patron attribute types and make then staff_searchable
2 - Add some values to patrons
3 - Confirm they are searched in 'Standard' search, but there is no other way to search them
4 - Apply patch
5 - Confirm the fields now show in patorn search dropdowns
6 - Search using 'standard' and confirm the searhc works
7 - Search specific attributes and confirm the searhc works

Signed-off-by: Janusz Kaczmarek <januszop@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Nick Clemens 2023-08-11 15:57:42 +00:00 committed by Tomas Cohen Arazi
parent cf70fd27da
commit cdbf176e8f
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc
View File

@ -99,5 +99,14 @@
<option value=[% s_o | html %]>[% display_name | $raw %]</option>
[% END %]
[% END %]
[% IF Koha.Preference('ExtendedPatronAttributes') %]
[% FOREACH attribute IN ExtendedAttributeTypes.all( staff_searchable => 1 ) %]
[% IF searchfieldstype == "_ATTR_" _ attribute.code %]
<option value=[% "_ATTR_" _ attribute.code | html %] selected="selected">[% attribute.description | html %]</option>
[% ELSE %]
<option value=[% "_ATTR_" _ attribute.code | html %]>[% attribute.description | html %]</option>
[% END %]
[% END %]
[% END %]
</select>
[%- END -%]

23
koha-tmpl/intranet-tmpl/prog/js/staff-global.js
View File

@ -575,7 +575,7 @@ function buildPatronSearchQuery(term, options) {
let q = [];
let leading_wildcard;
let search_fields;
let search_fields = [];
let patterns = term.split(/[\s,]+/).filter(function (s) { return s.length });
// Bail if no patterns
@ -591,9 +591,18 @@ function buildPatronSearchQuery(term, options) {
leading_wildcard = defaultPatronSearchMethod === 'contains' ? '%' : '';
}
let searched_attribute_fields = [];
// Search fields: If search_fields option exists, we use that
if (typeof options !== 'undefined' && options.search_fields) {
search_fields = expandPatronSearchFields(options.search_fields);
expand_fields = expandPatronSearchFields(options.search_fields);
expand_fields.split('\|').forEach(function (field, i) {
if( field.startsWith('_ATTR_') ){
let attr_field = field.replace("_ATTR_","");
searched_attribute_fields.push( attr_field );
} else {
search_fields.push( field );
}
});
// If not, we use DefaultPatronSearchFields system preference instead
} else {
search_fields = defaultPatronSearchFields;
@ -603,7 +612,7 @@ function buildPatronSearchQuery(term, options) {
let pattern_subquery_and = [];
patterns.forEach(function (pattern, i) {
let pattern_subquery_or = [];
search_fields.split('\|').forEach(function (field, i) {
search_fields.forEach(function (field, i) {
pattern_subquery_or.push(
{ ["me." + field]: { 'like': leading_wildcard + pattern + '%' } }
);
@ -620,9 +629,10 @@ function buildPatronSearchQuery(term, options) {
});
q.push({ "-and": pattern_subquery_and });
// Add full search term for each search field
let term_subquery_or = [];
search_fields.split('\|').forEach(function (field, i) {
search_fields.forEach(function (field, i) {
term_subquery_or.push(
{ ["me." + field]: { 'like': leading_wildcard + term + '%' } }
);
@ -630,13 +640,14 @@ function buildPatronSearchQuery(term, options) {
q.push({ "-or": term_subquery_or });
// Add each pattern for each extended patron attributes
if (typeof options !== 'undefined' && options.search_fields == 'standard' && options.extended_attribute_types && extendedPatronAttributes) {
if ( typeof options !== 'undefined' && ( (options.search_fields == 'standard' && options.extended_attribute_types) || searched_attribute_fields ) && extendedPatronAttributes) {
extended_attribute_codes_to_search = (searched_attribute_fields.length > 0) ? searched_attribute_fields : options.extended_attribute_types;
extended_attribute_subquery_and = [];
patterns.forEach(function (pattern, i) {
let extended_attribute_sub_or = [];
extended_attribute_sub_or.push({
"extended_attributes.value": { "like": leading_wildcard + pattern + '%' },
"extended_attributes.code": options.extended_attribute_types
"extended_attributes.code": extended_attribute_codes_to_search
});
extended_attribute_subquery_and.push(extended_attribute_sub_or);
});