From 3b966ff578e256a8e7d24a7ffceb85431d744c7a Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 1 Oct 2020 13:40:41 +0100
Subject: [PATCH] Bug 21883: Pass the item to the template

This patch update the controller to pass a full item object to the
template instead of a subset of item fields and updates the template to
utilise the object.
---
 circ/returns.pl                                  |  6 +-----
 .../prog/en/modules/circ/returns.tt              | 16 ++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/circ/returns.pl b/circ/returns.pl
index 7a45995eed..dddc869ba9 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -272,17 +272,13 @@ if ($barcode) {
         my $biblio   = $item->biblio;
         $template->param(
             title                => $biblio->title,
-            homebranch           => $item->homebranch,
-            holdingbranch        => $item->holdingbranch,
             returnbranch         => $returnbranch,
             author               => $biblio->author,
-            itembarcode          => $item->barcode,
-            itemtype             => $item->effective_itemtype,
-            ccode                => $item->ccode,
             itembiblionumber     => $biblio->biblionumber,
             biblionumber         => $biblio->biblionumber,
             additional_materials => $materials,
             issue                => $checkout,
+            item                 => $item,
         );
     } # FIXME else we should not call AddReturn but set BadBarcode directly instead
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index fefcc8f02e..dab49744a9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -127,7 +127,7 @@
                             [% IF ( collectionItemNeedsTransferred ) %]
                                  <div id="rotating-collection" class="dialog message">
                                     <h3>Please transfer item to: [% Branches.GetName( collectionBranch ) | html %]</h3>
-                                    <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
+                                    <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% item.barcode | html %]: [% title | html %]</a></p>
                                     <p>This item is part of a rotating collection.</p>
                                     <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | uri %]&amp;branchcode=[% collectionBranch | uri %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
                                 </div>
@@ -188,7 +188,7 @@
                                 <div class="dialog alert audio-alert-warning">
                                     <h3>Check in message</h3>
                                     [% IF itembiblionumber %]
-                                        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p>
+                                        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% item.barcode | html %]: [% title | html %]</a></p>
                                     [% END %]
                                     [% FOREACH errmsgloo IN errmsgloop %]
                                         [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
@@ -316,7 +316,7 @@
                                         </div>
                                         <div class="modal-footer">
                                             <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-                                                <input type="hidden" name="barcode" value="[% itembarcode | html %]" />
+                                                <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
                                                 <input type="hidden" name="multiple_confirm" value="1" />
                                                 [% FOREACH inputloo IN inputloop %]
                                                     <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
@@ -345,7 +345,7 @@
                                             <div class="modal-body">
                                                 <p>
                                                     <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
-                                                        [% itembarcode | html %]: [% title | html %]
+                                                        [% item.barcode | html %]: [% title | html %]
                                                     </a>
                                                 </p>
                                                 <p>
@@ -388,7 +388,7 @@
                                             <div class="modal-body">
                                                 <p>
                                                     <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
-                                                        [% itembarcode | html %]: [% title | html %]
+                                                        [% item.barcode | html %]: [% title | html %]
                                                     </a>
                                                 </p>
                                                 [% INCLUDE all_checkin_messages %]
@@ -430,7 +430,7 @@
                                                         <br/>
                                                         <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a>
                                                         <div class="hold-found-barcode">
-                                                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | uri %]">[% itembarcode | html %]</a>
+                                                            <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | uri %]">[% item.barcode | html %]</a>
                                                         </div>
                                                     </h3>
                                                 </div>
@@ -533,7 +533,7 @@
                                                 <div class="modal-body">
                                                     <p>
                                                         <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">
-                                                            [% itembarcode | html %]: [% title | html %]
+                                                            [% item.barcode | html %]: [% title | html %]
                                                         </a>
                                                     </p>
                                                     [% IF !transfer %]
@@ -589,7 +589,7 @@
                                                         <br/>
                                                         <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a>
                                                         <div class="hold-found-barcode">
-                                                            (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | uri %]">[% itembarcode | html %]</a>)
+                                                            (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&amp;itemnumber=[% itemnumber | uri %]">[% item.barcode | html %]</a>)
                                                         </div>
                                                     </h3>
                                                 </div>
-- 
2.20.1