From c5dc3cf3f49ec8e6ad1b7909ad1db939df8d2ad8 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 16 Jan 2024 12:57:34 +0000 Subject: [PATCH] Bug 33457: Improve display of fund users when the patron has no firstname This patch updates the way the fund modification page handles patron names so that a patron with only a first name or only a surname will have their name appear correctly when selected as a manager or a user. To test, apply the patch if necessary, create a patron with only a first name and one with only a surname and give them acquisitions permissions. - Go to Administration -> Funds. - Edit a fund. - Click 'Add users'. - Select a user, only staff users will be searchable - Select one of the patrons you created. - The patron name should appear correctly - Test with both your first name only patron and your last name only patron. - Perform the same test with the 'Select owner' process. Signed-off-by: Lucas Gass Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer (cherry picked from commit 00ed806d204f60acb419052f177001d5a76b1310) Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 5f4a02790f..73cdabc6df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -650,7 +650,7 @@ e.preventDefault(); var borrowernumber = $(this).data("borrowernumber"); var borrower_data = JSON.parse($("#borrower_data"+borrowernumber).val()); - add_user( borrowernumber, borrower_data.firstname + " " + borrower_data.surname ); + add_user( borrowernumber, ( borrower_data.firstname ? borrower_data.firstname : "" ) + ' ' + ( borrower_data.surname ? borrower_data.surname : "" ) ); }); $("body").on("click",".select_user",function(e){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 60531cd3f6..64296ed98a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -558,7 +558,7 @@ function select_user(borrowernumber, borrower) { ownerRemove(); - var borrowername = borrower.firstname + ' ' + borrower.surname; + var borrowername = ( borrower.firstname ? borrower.firstname : "" ) + ' ' + ( borrower.surname ? borrower.surname : "" ); if (borrowernumber) { var ownerlink = '' -- 2.39.5