From b1c18559eb3d94812e495ae59206a444dcd338bd Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 20 Apr 2022 10:37:08 +0000 Subject: [PATCH] Bug 28633: (follow-up) Display effective name in JS search Also I fix the other header search, and ensure the 'Standard' option wil appear in dropdowns --- .../intranet-tmpl/prog/en/includes/js-patron-format.inc | 6 ++++-- .../intranet-tmpl/prog/en/includes/patron-search-header.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format.inc index 0c1daae17f..3c437ae193 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format.inc @@ -20,16 +20,18 @@ var name; var firstname = escape_str(patron.firstname); + var preferred_name = escape_str(patron.preferred_name); var surname = escape_str(patron.surname); + var effective_name = preferred_name || firstname; if ( patron.other_name != null && patron.other_name != '' ) { firstname += ' (' + escape_str(patron.other_name) + ')'; } if ( config && config.invert_name ) { - name = surname + ( firstname ? ', ' + firstname : '' ); + name = surname + ( effective_name ? ', ' + effective_name : '' ); } else { - name = firstname + ' ' + surname; + name = effective_name + ' ' + surname; } if ( config && config.display_cardnumber ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc index 49f3852fa1..b6cda723cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc @@ -24,7 +24,7 @@