Bugzilla – Attachment 161300 Details for
Bug 33457
Improve display of fund users when the patron has no firstname
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33457: (QA follow-up) Use js-patron-format instead
Bug-33457-QA-follow-up-Use-js-patron-format-instea.patch (text/plain), 2.62 KB, created by
Martin Renvoize
on 2024-01-23 14:49:25 UTC
(
hide
)
Description:
Bug 33457: (QA follow-up) Use js-patron-format instead
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2024-01-23 14:49:25 UTC
Size:
2.62 KB
patch
obsolete
>From c4cf3f114e6fd0e08858dab18f835438b634b3e1 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 23 Jan 2024 14:44:27 +0000 >Subject: [PATCH] Bug 33457: (QA follow-up) Use js-patron-format instead > >This patch updates the code to use the $patron_to_html js function >rather than replicating it locally.. this means if in the future we >introduce further fixes/improvements to the display they're affect here >too. > >Test plan >1) As for the original implementation, confirm the fix is still fixed >--- > koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 3 ++- > 2 files changed, 3 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 715e0db2b47..26a36f89515 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.firstname : "" ) + ' ' + ( borrower_data.surname ? borrower_data.surname : "" ) ); >+ add_user( borrowernumber, $patron_to_html( borrower_data, { display_cardnumber: false, url: false } ) ); > }); > > $("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 c6b95bb33cb..6b9ef7a0825 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -537,6 +537,7 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acq.js") | $raw %] > [% IF op == 'add_form' %] >+ [% INCLUDE 'js-patron-format.inc' %] > <script> > //<![CDATA[ > >@@ -558,7 +559,7 @@ > > function select_user(borrowernumber, borrower) { > ownerRemove(); >- var borrowername = ( borrower.firstname ? borrower.firstname : "" ) + ' ' + ( borrower.surname ? borrower.surname : "" ); >+ var borrowername = $patron_to_html( borrower, { display_cardnumber: false, url: false } ); > if (borrowernumber) { > var ownerlink = '<a href="/cgi-bin/koha/members/moremember.pl' > + '?borrowernumber=' + borrowernumber + '">' >-- >2.43.0
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 33457
:
161064
|
161124
|
161299
|
161300
|
161392
|
161395
|
161396