From 10903a825ff99901b7cbb2411f494de72cb988a4 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. Signed-off-by: David Nind <david@davidnind.com> --- circ/returns.pl | 6 +----- koha-tmpl/intranet-tmpl/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 b58e340f85..770105289b 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -268,17 +268,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 d60cd46087..8c76f7b043 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -146,7 +146,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&biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p> + <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&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 %]&branchcode=[% collectionBranch | uri %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p> </div> @@ -207,7 +207,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&biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p> + <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% item.barcode | html %]: [% title | html %]</a></p> [% END %] [% FOREACH errmsgloo IN errmsgloop %] [% IF ( errmsgloo.NotForLoanStatusUpdated ) %] @@ -346,7 +346,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 %]" /> @@ -375,7 +375,7 @@ <div class="modal-body"> <p> <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]"> - [% itembarcode | html %]: [% title | html %] + [% item.barcode | html %]: [% title | html %] </a> </p> <p> @@ -418,7 +418,7 @@ <div class="modal-body"> <p> <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]"> - [% itembarcode | html %]: [% title | html %] + [% item.barcode | html %]: [% title | html %] </a> </p> [% INCLUDE all_checkin_messages %] @@ -460,7 +460,7 @@ <br/> <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a> <div class="hold-found-barcode"> - <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&itemnumber=[% itemnumber | uri %]">[% itembarcode | html %]</a> + <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&itemnumber=[% itemnumber | uri %]">[% item.barcode | html %]</a> </div> </h3> </div> @@ -563,7 +563,7 @@ <div class="modal-body"> <p> <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]"> - [% itembarcode | html %]: [% title | html %] + [% item.barcode | html %]: [% title | html %] </a> </p> [% IF !transfer %] @@ -619,7 +619,7 @@ <br/> <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a> <div class="hold-found-barcode"> - (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&itemnumber=[% itemnumber | uri %]">[% itembarcode | html %]</a>) + (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% itembiblionumber | uri %]&itemnumber=[% itemnumber | uri %]">[% item.barcode | html %]</a>) </div> </h3> </div> -- 2.11.0