Bugzilla – Attachment 33059 Details for
Bug 8836
Resurrect Rotating Collections
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8836 [QA Followup] - Fix koha-qa.pl errors reported
Bug-8836-QA-Followup---Fix-koha-qapl-errors-report.patch (text/plain), 6.23 KB, created by
Kyle M Hall (khall)
on 2014-10-31 13:09:44 UTC
(
hide
)
Description:
Bug 8836 [QA Followup] - Fix koha-qa.pl errors reported
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-10-31 13:09:44 UTC
Size:
6.23 KB
patch
obsolete
>From 061893b0c992d518c2c335b4d4c726877f42581f Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 15 Oct 2014 10:46:28 -0400 >Subject: [PATCH] Bug 8836 [QA Followup] - Fix koha-qa.pl errors reported > >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> > >Trusting the sign off on the other page, I only tested the QA changes > >Signed-off-by: Cindy Murdock Ames <cmurdock@ccfls.org> > >Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> >--- > circ/returns.pl | 10 +++++----- > installer/data/mysql/updatedatabase.pl | 8 ++++---- > rotating_collections/addItems.pl | 2 +- > rotating_collections/editCollections.pl | 2 +- > rotating_collections/rotatingCollections.pl | 2 +- > rotating_collections/transferCollection.pl | 2 +- > 6 files changed, 13 insertions(+), 13 deletions(-) > >diff --git a/circ/returns.pl b/circ/returns.pl >index 8a17a10..eeb0fe3 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -217,7 +217,7 @@ if ($dotransfer){ > # An item has been returned to a branch other than the homebranch, and the librarian has chosen to initiate a transfer > my $transferitem = $query->param('transferitem'); > my $tobranch = $query->param('tobranch'); >- ModItemTransfer($transferitem, $userenv_branch, $tobranch); >+ ModItemTransfer($transferitem, $userenv_branch, $tobranch); > } > > if ($canceltransfer){ >@@ -276,7 +276,7 @@ if ($barcode) { > itembarcode => $biblio->{'barcode'}, > itemtype => $biblio->{'itemtype'}, > ccode => $biblio->{'ccode'}, >- itembiblionumber => $biblio->{'biblionumber'}, >+ itembiblionumber => $biblio->{'biblionumber'}, > borrower => $borrower, > additional_materials => $biblio->{'materials'}, > ); >@@ -305,7 +305,7 @@ if ($barcode) { > $template->param( fineborrowernumber => $borrower->{'borrowernumber'} ); > } > } >- >+ > if (C4::Context->preference("WaitingNotifyAtCheckin") ) { > #Check for waiting holds > my @reserves = GetReservesFromBorrowernumber($borrower->{'borrowernumber'}); >@@ -314,7 +314,7 @@ if ($barcode) { > if ( $num_res->{'found'} eq 'W' && $num_res->{'branchcode'} eq $userenv_branch) { > $waiting_holds++; > } >- } >+ } > if ($waiting_holds > 0) { > $template->param( > waiting_holds => $waiting_holds, >@@ -600,7 +600,7 @@ $template->param( > BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"), > ); > >-my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') ); >+$itemnumber = GetItemnumberFromBarcode( $query->param('barcode') ); > if ( $itemnumber ) { > my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber ); > if ( ! ( $holdingBranch eq $collectionBranch ) ) { >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index b9699ac..7369f04 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -3417,10 +3417,10 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > $DBversion = '3.01.00.108'; > if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > $dbh->do(qq{ >- ALTER TABLE `export_format` ADD `csv_separator` VARCHAR( 2 ) NOT NULL AFTER `marcfields` , >- ADD `field_separator` VARCHAR( 2 ) NOT NULL AFTER `csv_separator` , >- ADD `subfield_separator` VARCHAR( 2 ) NOT NULL AFTER `field_separator` >- }); >+ ALTER TABLE `export_format` ADD `csv_separator` VARCHAR( 2 ) NOT NULL AFTER `marcfields` , >+ ADD `field_separator` VARCHAR( 2 ) NOT NULL AFTER `csv_separator` , >+ ADD `subfield_separator` VARCHAR( 2 ) NOT NULL AFTER `field_separator` >+ }); > print "Upgrade to $DBversion done (added separators for csv export)\n"; > SetVersion ($DBversion); > } >diff --git a/rotating_collections/addItems.pl b/rotating_collections/addItems.pl >index 9ef4f39..10be5cb 100755 >--- a/rotating_collections/addItems.pl >+++ b/rotating_collections/addItems.pl >@@ -30,7 +30,7 @@ my $query = new CGI; > > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > { >- template_name => "rotating_collections/addItems.tmpl", >+ template_name => "rotating_collections/addItems.tt", > query => $query, > type => "intranet", > authnotrequired => 0, >diff --git a/rotating_collections/editCollections.pl b/rotating_collections/editCollections.pl >index aa46f44..39e94a5 100755 >--- a/rotating_collections/editCollections.pl >+++ b/rotating_collections/editCollections.pl >@@ -30,7 +30,7 @@ my $query = new CGI; > > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > { >- template_name => "rotating_collections/editCollections.tmpl", >+ template_name => "rotating_collections/editCollections.tt", > query => $query, > type => "intranet", > authnotrequired => 0, >diff --git a/rotating_collections/rotatingCollections.pl b/rotating_collections/rotatingCollections.pl >index 59bbcdb..a27ce74 100755 >--- a/rotating_collections/rotatingCollections.pl >+++ b/rotating_collections/rotatingCollections.pl >@@ -29,7 +29,7 @@ my $query = new CGI; > > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > { >- template_name => "rotating_collections/rotatingCollections.tmpl", >+ template_name => "rotating_collections/rotatingCollections.tt", > query => $query, > type => "intranet", > authnotrequired => 0, >diff --git a/rotating_collections/transferCollection.pl b/rotating_collections/transferCollection.pl >index 630c222..6f92356 100755 >--- a/rotating_collections/transferCollection.pl >+++ b/rotating_collections/transferCollection.pl >@@ -33,7 +33,7 @@ my $toBranch = $query->param('toBranch'); > > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > { >- template_name => "rotating_collections/transferCollection.tmpl", >+ template_name => "rotating_collections/transferCollection.tt", > query => $query, > type => "intranet", > authnotrequired => 0, >-- >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 8836
:
12560
|
16746
|
19118
|
19119
|
19337
|
19339
|
21008
|
21009
|
21010
|
21011
|
23966
|
23967
|
23968
|
23969
|
23970
|
23971
|
23976
|
28140
|
28141
|
30838
|
30921
|
31087
|
32361
|
32362
|
32588
|
32589
|
32690
|
32691
|
32693
|
32773
|
32774
|
32973
|
32974
|
32975
|
32976
|
32994
|
32999
|
33000
|
33001
|
33002
|
33045
|
33046
|
33047
|
33048
|
33050
|
33051
|
33058
|
33059
|
33060
|
33061
|
33062
|
33063
|
33064
|
33065
|
33066
|
33068
|
33070
|
33095
|
33096
|
33097
|
33098
|
33099
|
33100
|
33101
|
33102
|
33103
|
33330
|
33331
|
33374