From 6932adbae1fe0db927d91f6d021b2c0f0d0a44d0 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 19 Nov 2012 15:15:30 -0500 Subject: [PATCH] Bug 8004 - Followup - Rename KohaBranchName filter to BranchName This patch renames the TT filter KohaBranchName to just BranchName, as the Koha is superfluous. Test Plan: 1) Apply patch 2) Attempt to transfer an item to the incorrect branch, you should see the name of the branch in the "please return to" message. --- .../Plugin/{KohaBranchName.pm => BranchName.pm} | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename Koha/Template/Plugin/{KohaBranchName.pm => BranchName.pm} (95%) diff --git a/Koha/Template/Plugin/KohaBranchName.pm b/Koha/Template/Plugin/BranchName.pm similarity index 95% rename from Koha/Template/Plugin/KohaBranchName.pm rename to Koha/Template/Plugin/BranchName.pm index a39aba0..9747335 100644 --- a/Koha/Template/Plugin/KohaBranchName.pm +++ b/Koha/Template/Plugin/BranchName.pm @@ -1,4 +1,4 @@ -package Koha::Template::Plugin::KohaBranchName; +package Koha::Template::Plugin::BranchName; # Copyright Bywater Solutions 2012 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 8923188..c29f948 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1,5 +1,5 @@ [% USE KohaDates %] -[% USE KohaBranchName %] +[% USE BranchName %] [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Check in [% title |html %] @@ -92,7 +92,7 @@ $(document).ready(function () { [% END %] -[% IF ( WrongTransfer ) %]

Please return [% title |html %] to [% TransferWaitingAt | $KohaBranchName %]

Print slip or Cancel transfer

+[% IF ( WrongTransfer ) %]

Please return [% title |html %] to [% TransferWaitingAt | $BranchName %]

Print slip or Cancel transfer

[% IF ( wborcnum ) %]
Hold for: