From be9efdd6387a99672657c8f4f7fada33b359679a Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@biblibre.com> Date: Mon, 13 Apr 2015 13:21:49 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 7981: Use The Branches TT plugin instead of GetBranchName Note that homebranchname is never used in the template. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> --- circ/returns.pl | 2 -- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/circ/returns.pl b/circ/returns.pl index f7614cb..6d4c506 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -263,9 +263,7 @@ if ($barcode) { $template->param( title => $biblio->{'title'}, homebranch => $biblio->{'homebranch'}, - homebranchname => GetBranchName( $biblio->{'homebranch'} ), returnbranch => $returnbranch, - returnbranchname => GetBranchName( $returnbranch ), author => $biblio->{'author'}, itembarcode => $biblio->{'barcode'}, itemtype => $biblio->{'itemtype'}, 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 e128ad6..0cb6c72 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -264,7 +264,7 @@ $(document).ready(function () { [% IF ( transfer ) %] <!-- transfer: item with no reservation, must be returned according to home library circulation rules --> <div id="return1" class="dialog message"> - <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% returnbranchname %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% returnbranch %]&op=slip'); return true;">Print slip</a> )</h3> + <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% Branches.GetName( returnbranchname ) %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% returnbranch %]&op=slip'); return true;">Print slip</a> )</h3> </div> [% IF ( soundon ) %] <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio> @@ -276,7 +276,7 @@ $(document).ready(function () { [% IF ( soundon ) %] <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio> [% END %] - <div id="item-transfer" class="dialog message"><h3> This item needs to be transferred to [% returnbranchname %]</h3> + <div id="item-transfer" class="dialog message"><h3> This item needs to be transferred to [% Branches.GetName( returnbranchname ) %]</h3> Transfer now?<br /> <form method="post" action="returns.pl" name="mainform" id="mainform"> [% IF itemnumber %] -- 1.7.2.5