From fc60929874fb5a328c7f2ea8d4c404ba2b7984b4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 29 Mar 2021 14:57:22 +0000 Subject: [PATCH] Bug 27817: Use biblio-title include in some acquisitions pages This patch adds the use of the biblio-title include in acquisitions templates which get the right data from their corresponding scripts. To test, apply the patch and test these Acquisitions pages to confirm that titles with 245$b, 245$h, etc, show all the correct information. - Acquisitions -> Vendor -> Basket - Acquisitions -> Vendor -> Uncertain prices - Acquisitions -> Invoices -> Invoice - Acquisitions -> Invoices -> Invoice -> View an invoice which has an already-received bibliographic record. - Go to receipt page -> Already received. -- The "Pending orders" table is unmodified because I wasn't sure how to use the biblio-title include in an AJAX DataTable. --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 6 +++++- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 56462c51d5..a932c5f25c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -486,7 +486,7 @@

[% IF ( books_loo.order_received ) %] (received)[% END %] [% IF books_loo.title %] - [% books_loo.title | html %][% IF books_loo.author %] by [% books_loo.author | html %][% END %] + [% INCLUDE 'biblio-title.inc' biblio=books_loo link = 1 %] [% IF books_loo.author %] by [% books_loo.author | html %][% END %] [% ELSE %] Deleted bibliographic record, can't find title
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 6638449a4b..4b02f1ff65 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -342,7 +342,7 @@ [% IF order.biblionumber %] - [% order.title | html %] + [% INCLUDE 'biblio-title.inc' biblio=order link = 1 %] [% IF ( order.author ) %]
by [% order.author | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index de7522c5af..18c0f111fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -34,7 +34,11 @@

Catalog details -
  1. Title: [% order.biblio.title | html %]
  2. +
      +
    1. + Title: + [% INCLUDE 'biblio-title.inc' biblio=order.biblio link = 1 %] +
    2. Author: [% order.biblio.author | html %]
    3. Copyright: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 44ecee72ea..d0d8a2bbe3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -213,7 +213,8 @@ 0 [% END %] - [% order.title | html %] + + [% INCLUDE 'biblio-title.inc' biblio=order link = 1 %] [% IF ( order.author ) %] / [% order.author | html %][% END %] [% IF ( order.isbn ) %] - [% order.isbn | html %][% END %] [% IF ( order.publishercode ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index 20f1fbe302..be9fe973e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -90,7 +90,7 @@ [% uncertainpriceorder.basketname | html %] - [% uncertainpriceorder.title | html %] + [% INCLUDE 'biblio-title.inc' biblio=uncertainpriceorder link = 1 %] [% IF ( uncertainpriceorder.author ) %] by [% uncertainpriceorder.author | html %][% END %] [% IF ( uncertainpriceorder.publishercode ) %]
      Publisher: [% uncertainpriceorder.publishercode | html %] -- 2.11.0