From dfe71bac8dcefb3f5308ce84fa86676fab0b3ac4 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 23 May 2023 13:31:25 +0200 Subject: [PATCH] Bug 33568: Display library names instead of codes for transfers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Owen Leonard Signed-off-by: Laurence Rault Signed-off-by: Emily Lamancusa Signed-off-by: Tomás Cohen Arazi Signed-off-by: Katrin Fischer --- Koha/Item/Transfer.pm | 15 +++++++++++++++ api/v1/swagger/paths/biblios.yaml | 1 + .../prog/en/modules/catalogue/detail.tt | 6 +++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Koha/Item/Transfer.pm b/Koha/Item/Transfer.pm index 74ec297ec9..689ff205c2 100644 --- a/Koha/Item/Transfer.pm +++ b/Koha/Item/Transfer.pm @@ -176,6 +176,21 @@ sub cancel { return $self; } + +=head3 strings_map + +Returns a map of column name to string representations including the string. + +=cut + +sub strings_map { + my ($self) = @_; + return { + from_library => { str => $self->from_library->branchname, type => 'library' }, + to_library => { str => $self->to_library->branchname, type => 'library' }, + }; +} + =head3 type =cut diff --git a/api/v1/swagger/paths/biblios.yaml b/api/v1/swagger/paths/biblios.yaml index 3ba4be8d20..bff7043851 100644 --- a/api/v1/swagger/paths/biblios.yaml +++ b/api/v1/swagger/paths/biblios.yaml @@ -426,6 +426,7 @@ - checkout - checkout.patron - transfer + - transfer+strings - first_hold - first_hold.patron - recall 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 51feee450f..84a8f36b70 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -2173,7 +2173,7 @@ [%# In case or SeparateHoldings we may need to display the number of biblios in each tab %] [%# Do we need separate/new endpoints or do we hack the somewhere client-side? %] let item_table_url = "/api/v1/biblios/[% biblio.biblionumber | uri %]/items?"; - let embed = ["+strings,checkout,checkout.patron,transfer,first_hold,first_hold.patron,item_type"]; + let embed = ["+strings,checkout,checkout.patron,transfer,transfer+strings,first_hold,first_hold.patron,item_type"]; [% IF Koha.Preference('LocalCoverImages') %] embed.push('cover_image_ids'); [% END %] @@ -2397,9 +2397,9 @@ nodes += "" } else if ( row.transfer ) { if ( row.transfer.datesent ) { - nodes += '%s'.format(_("In transit from %s to %s since %s").format(escape_str(row.transfer.frombranch), escape_str(row.transfer.tobranch), $date(row.transfer.datesent))); [%# FIXME display library names, not codes, do we use _strings here? %] + nodes += '%s'.format(_("In transit from %s to %s since %s").format(escape_str(row.transfer._strings.from_library.str), escape_str(row.transfer._strings.to_library.str), $date(row.transfer.datesent))); } else { - nodes += '%s'.format(_("Transit pending from %s to %s since %s").format(escape_str(row.transfer.frombranch), escape_str(row.transfer.tobranch), $date(row.transfer.daterequested))); [%# FIXME See above %] + nodes += '%s'.format(_("Transit pending from %s to %s since %s").format(escape_str(row.transfer._strings.from_library_.str), escape_str(row.transfer._strings.to_library.str), $date(row.transfer.daterequested))); } } -- 2.39.5