From 9fdb5b8193c82c93d05bbcd02c68eb5747566eae Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 23 May 2023 13:37:33 +0200
Subject: [PATCH] Bug 33568: Bug 33568: Display library names instead of codes
 for recall
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>
---
 Koha/Recall.pm                                    | 15 +++++++++++++++
 api/v1/swagger/paths/biblios.yaml                 |  1 +
 .../prog/en/modules/catalogue/detail.tt           |  4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Koha/Recall.pm b/Koha/Recall.pm
index c70acb89dd1..6f3678f691f 100644
--- a/Koha/Recall.pm
+++ b/Koha/Recall.pm
@@ -461,6 +461,21 @@ sub set_fulfilled {
     return $self;
 }
 
+=head3 strings_map
+
+Returns a map of column name to string representations including the string.
+
+=cut
+
+sub strings_map {
+    my ($self) = @_;
+    return {
+        pickup_library_id => { str => $self->library->branchname, type => 'library' },
+    };
+}
+
+
+
 =head2 Internal methods
 
 =head3 _type
diff --git a/api/v1/swagger/paths/biblios.yaml b/api/v1/swagger/paths/biblios.yaml
index 6256d9d9494..95d5062f57d 100644
--- a/api/v1/swagger/paths/biblios.yaml
+++ b/api/v1/swagger/paths/biblios.yaml
@@ -431,6 +431,7 @@
             - first_hold+strings
             - first_hold.patron
             - recall
+            - recall+strings
             - recall.patron
             - item_type
             - in_bundle
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 62cf24ea27c..91511709653 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -2184,7 +2184,7 @@
             embed.push('serialitem.serial');
         [% END %]
         [% IF Koha.Preference('UseRecalls') %]
-            embed.push('recall', 'recall.patron')
+            embed.push('recall', 'recall+strings', 'recall.patron')
         [% END %]
         embed.push('in_bundle', 'bundle_host');
         [% IF Koha.Preference('UseCourseReserves') %]
@@ -2441,7 +2441,7 @@
                         [% IF Koha.Preference('UseRecalls') %]
                             if ( row.recall ) {
                                 if ( row.recall.waiting_date ) {
-                                    nodes += '<span>%s</span>'.format(_("Waiting at %s since %s").format(escape_str(row.recall.pickup_library_id), $date(row.recall.waiting_date))); # FIXME Display library names instead of codes
+                                    nodes += '<span>%s</span>'.format(_("Waiting at %s since %s").format(escape_str(row.recall.pickup_library_id.str), $date(row.recall.waiting_date)));
                                 } else {
                                     let patron_to_html = $patron_to_html(row.recall.patron);
                                     nodes += '<span>%s</span>'.format(_("recalled by %s on %s").format(patron_to_html, $date(row.recall.created_date)))
-- 
2.34.1