Bugzilla – Attachment 17911 Details for
Bug 8004
Items on hold lose transfer after being scanned twice
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8004 - Followup - Rename KohaBranchName filter to BranchName
Bug-8004---Followup---Rename-KohaBranchName-filter.patch (text/plain), 3.07 KB, created by
Kyle M Hall (khall)
on 2013-05-02 18:39:23 UTC
(
hide
)
Description:
Bug 8004 - Followup - Rename KohaBranchName filter to BranchName
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-05-02 18:39:23 UTC
Size:
3.07 KB
patch
obsolete
>From 6932adbae1fe0db927d91f6d021b2c0f0d0a44d0 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >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' %] > <title>Koha › Circulation › Check in [% title |html %]</title> >@@ -92,7 +92,7 @@ $(document).ready(function () { > </div> > [% END %] > <!-- case of a mistake in transfer loop --> >-[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt | $KohaBranchName %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% homebranch %]&op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1">Cancel transfer</a></h3> >+[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% TransferWaitingAt | $BranchName %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% homebranch %]&op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1">Cancel transfer</a></h3> > [% IF ( wborcnum ) %]<h5>Hold for:</h5> > <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]"> > [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li> >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8004
:
9289
|
13536
|
13537
|
17911
|
20582
|
20583
|
20682