Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

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>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
21.05.x
Martin Renvoize 4 years ago
committed by Jonathan Druart
parent
cef6bbd660
commit
00dfcfcbe8
2 changed files with 9 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      circ/returns.pl
  2. 16
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt

6
circ/returns.pl
View File

@ -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

16
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
View File

@ -160,7 +160,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>
@ -221,7 +221,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 ) %]
@ -360,7 +360,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 %]" />
@ -389,7 +389,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>
@ -432,7 +432,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 %]
@ -474,7 +474,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>
@ -577,7 +577,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 %]
@ -633,7 +633,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>

Write Preview
Loading…
Cancel
Save