Attachment 164358 Details for Bug 33568 – Bug 33568: follow-up for 29523

[patch] Bug 33568: follow-up for 29523

Bug-33568-follow-up-for-29523.patch (text/plain), 4.95 KB, created by Jonathan Druart on 2024-04-03 07:41:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2024-04-03 07:41:03 UTC

Size: 4.95 KB

patch

obsolete

>From b26da73728c589d9583c4d3c0e9723efb28d86bd Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 12 Oct 2023 16:50:10 +0200
>Subject: [PATCH] Bug 33568: follow-up for 29523
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Laurence Rault <laurence.rault@biblibre.com>
>Signed-off-by: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov>
>Signed-off-by: TomÃ¡s Cohen Arazi <tomascohen@theke.io>
>---
> .../html_helpers/tables/items/catalogue_detail.inc | 14 ++++++++++++--
> .../prog/en/includes/js-patron-format.inc | 4 ++++
> 2 files changed, 16 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc
>index 9ff4e401fb7..42dcfe34879 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc
>@@ -172,6 +172,7 @@
> e["_str"] = e["branchname"];
> return e;
> });
>+ const libraries_names = new Map(all_libraries.map( l => [l.branchcode, l.branchname] ));
> const all_item_types = [% To.json(ItemTypes.Get) | $raw %];
> const item_types_filters = all_item_types.map(e => {
> e["_id"] = e["itemtype"];
>@@ -437,13 +438,16 @@
> render: function (data, type, row, meta) {
> let nodes = "";
> if ( row.checkout ) {
>+ [%# Hacky for patron_to_html in case we simply want to display the patron's library name %]
>+ row.checkout.patron.library = { name: libraries_names.get(row.checkout.patron.library_id) };
>+
> nodes += '';
> if ( row.checkout.onsite_checkout ) {
>- let patron_to_html = $patron_to_html(row.checkout.patron); [%# FIXME What about hide_patron_infos_if_needed?? %]
>+ let patron_to_html = $patron_to_html(row.checkout.patron);
> nodes += _("Currently in local use by %s").format(patron_to_html);
> } else {
> nodes += '';
>- let patron_to_html = $patron_to_html(row.checkout.patron); [%# FIXME What about hide_patron_infos_if_needed?? %]
>+ let patron_to_html = $patron_to_html(row.checkout.patron);
> nodes += _("Checked out to %s").format(patron_to_html);
> }
> nodes += ': ';
>@@ -486,6 +490,9 @@
> }
> [% IF Koha.Preference('canreservefromotherbranches') %]
> if ( row.first_hold.waiting_date || row.first_hold.priority == 1 ) {
>+ [%# Hacky for patron_to_html in case we simply want to display the patron's library name %]
>+ row.first_hold.patron.library = { name: libraries_names.get(row.first_hold.patron.library_id) };
>+
> let patron_to_html = $patron_to_html(row.first_hold.patron); [%# FIXME What about hide_patron_infos_if_needed?? %]
> nodes += ' %s'.format(_("Hold for: %s").format(patron_to_html));
> }
>@@ -500,6 +507,9 @@
> if ( row.recall.waiting_date ) {
> nodes += '%s'.format(_("Waiting at %s since %s").format(escape_str(row.recall.pickup_library_id.str), $date(row.recall.waiting_date)));
> } else {
>+ [%# Hacky for patron_to_html in case we simply want to display the patron's library name %]
>+ row.recall.patron.library = { name: libraries_names.get(row.recall.patron.library_id) };
>+
> let patron_to_html = $patron_to_html(row.recall.patron);
> nodes += '%s'.format(_("recalled by %s on %s").format(patron_to_html, $date(row.recall.created_date)))
> }
>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 3f8cb940eed..a7fb8ad49b3 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
>@@ -49,6 +49,10 @@
> }
> }
> 
>+ if ( name.replace(' ', '').length == 0 ) {
>+ name = _("A patron from library %s".format(patron.library.name));
>+ }
>+
> return name;
> };
> })();
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 33568: 151339 | 153791 | 164308 | 164309 | 164310 | 164311 | 164312 | 164313 | 164314 | 164315 | 164316 | 164317 | 164318 | 164319 | 164320 | 164321 | 164322 | 164323 | 164324 | 164325 | 164326 | 164327 | 164328 | 164329 | 164330 | 164331 | 164332 | 164333 | 164334 | 164335 | 164336 | 164337 | 164338 | 164339 | 164340 | 164341 | 164342 | 164343 | 164344 | 164345 | 164346 | 164347 | 164348 | 164349 | 164350 | 164351 | 164352 | 164353 | 164354 | 164355 | 164356 | 164358 | 164359 | 164360 | 164361 | 164362 | 164363 | 164364 | 164365 | 164366 | 164367 | 164368 | 164369 | 164370 | 164371 | 164372 | 164373 | 164374 | 164472 | 164480 | 164482 | 164483 | 164485 | 164528