From 6c963746000a971719ba172c3c731ed8683131b7 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 26 Apr 2022 16:31:42 +0000 Subject: [PATCH] Bug 28633: Fix ysearch sorting This adds an IF conditional to the sorting to sort by preferred name or firstname I add the colmns to data for main patron searhc, but I cannot solve sorting there --- circ/ysearch.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/circ/ysearch.pl b/circ/ysearch.pl index bb440d7e58..a9982ffd8f 100755 --- a/circ/ysearch.pl +++ b/circ/ysearch.pl @@ -75,7 +75,7 @@ my $borrowers_rs = Koha::Patrons->search_limited( # Get the first 10 results page => 1, rows => 10, - order_by => [ 'surname', 'firstname' ], + order_by => [ 'surname', \'IF(preferred_name != "" AND preferred_name IS NOT NULL, preferred_name, firstname)' ], prefetch => 'branchcode', }, ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index fafe0613f0..a2fcde30c0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -440,7 +440,7 @@ } [% CASE 'name-address' %] { - "data": "me.surname:me.firstname:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country", + "data": "me.surname:me.preferred_name:me.firstname:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country", "searchable": true, "orderable": true, "render": function( data, type, row, meta ) { @@ -465,7 +465,7 @@ } [% CASE 'name-address' %] { - "data": "me.surname:me.firstname:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country", + "data": "me.surname:me.preferred_name:me.firstname:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country", "searchable": true, "orderable": true, "render": function( data, type, row, meta ) { @@ -490,7 +490,7 @@ } [% CASE 'name' %] { - "data": "me.surname:me.firstname:me.othernames", + "data": "me.surname:me.preferred_name:me.firstname:me.othernames", "searchable": true, "orderable": true, "render": function( data, type, row, meta ) { -- 2.30.2