From f56bf22e1de7bc80db884f75e5b046ec95df81ab Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 6 Oct 2025 15:45:50 +0200 Subject: [PATCH] Bug 40958: Move patron_to_html to a standalone JS file It will be easier to reuse patron_to_html Test plan: Search for patron and confirm that that patron are formatted correctly. Global patron search and a couple of other places should be enough. Signed-off-by: Andrew Fuerste Henry --- .../prog/en/includes/js-patron-format.inc | 71 ---------------- .../prog/en/includes/js_includes.inc | 1 + .../prog/en/includes/patron-search.inc | 1 - .../prog/en/modules/acqui/vendors.tt | 1 - .../prog/en/modules/admin/aqbudgets.tt | 1 - .../prog/en/modules/admin/record_sources.tt | 1 - .../prog/en/modules/bookings/list.tt | 1 - .../prog/en/modules/catalogue/detail.tt | 1 - .../prog/en/modules/catalogue/moredetail.tt | 1 - .../prog/en/modules/cataloguing/concerns.tt | 1 - .../prog/en/modules/circ/curbside_pickups.tt | 1 - .../prog/en/modules/circ/pendingbookings.tt | 1 - .../intranet-tmpl/prog/en/modules/erm/erm.tt | 1 - .../prog/en/modules/ill/ill-requests.tt | 1 - .../prog/en/modules/members/ill-requests.tt | 1 - .../prog/en/modules/members/readingrec.tt | 1 - .../prog/en/modules/preservation/home.tt | 1 - .../en/modules/tools/batch_modify_holds.tt | 1 - .../intranet-tmpl/prog/js/patron-format.js | 81 +++++++++++++++++++ 19 files changed, 82 insertions(+), 87 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/js/patron-format.js 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 deleted file mode 100644 index 682d109b46f..00000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format.inc +++ /dev/null @@ -1,71 +0,0 @@ - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc index d968eb82864..75ca87955c3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc @@ -25,6 +25,7 @@ [% Asset.js("lib/bootstrap/bootstrap.bundle.min.js") | $raw %] [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %] +[% Asset.js("js/patron-format.js") | $raw %] [% Asset.js("js/staff-global.js") | $raw %] [% Asset.js("js/form-submit.js",{'type' => 'module'}) | $raw %] [% INCLUDE 'js-date-format.inc' %] 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 a4f76e8e116..384cf72157a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -304,7 +304,6 @@ [% INCLUDE 'datatables.inc' %] [% INCLUDE 'js-patron-get-age.inc' %] - [% INCLUDE 'js-patron-format.inc' %] [% INCLUDE 'js-patron-format-address.inc' %] - [% INCLUDE 'js-patron-format.inc' %] [% INCLUDE 'js-biblio-format.inc' %] [% Asset.js("js/browser.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 93faa13bec9..16ec134a580 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -585,7 +585,6 @@ - [% INCLUDE 'js-patron-format.inc' %] [% Asset.js("js/catalog.js") | $raw %] [% Asset.js("js/browser.js") | $raw %] [% Asset.js("js/checkout_renewals_modal.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt index cad5cc9c141..f8df6be4c61 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt @@ -62,7 +62,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'js-date-format.inc' %] - [% INCLUDE 'js-patron-format.inc' %] [% INCLUDE 'js-biblio-format.inc' %] [% INCLUDE 'calendar.inc' %] - [% INCLUDE 'js-patron-format.inc' %] [% INCLUDE 'datatables.inc' %]