Bugzilla – Attachment 6140 Details for
Bug 6679
Fixing code so it passes basic Perl::Critic tests
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6679 : Declare variables outside of conditionals
Bug-6679--Declare-variables-outside-of-conditional.patch (text/plain), 4.03 KB, created by
Chris Cormack
on 2011-11-02 03:02:43 UTC
(
hide
)
Description:
Bug 6679 : Declare variables outside of conditionals
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2011-11-02 03:02:43 UTC
Size:
4.03 KB
patch
obsolete
>From c793b05293a8575cd9e768be53086c93114c7850 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Wed, 2 Nov 2011 16:00:01 +1300 >Subject: [PATCH] Bug 6679 : Declare variables outside of conditionals > >--- > labels/label-create-pdf.pl | 10 ++++++---- > labels/label-create-xml.pl | 27 ++++++++++++++++++++++++--- > labels/label-edit-batch.pl | 9 ++++++--- > 3 files changed, 36 insertions(+), 10 deletions(-) > >diff --git a/labels/label-create-pdf.pl b/labels/label-create-pdf.pl >index d45b561..106b37d 100755 >--- a/labels/label-create-pdf.pl >+++ b/labels/label-create-pdf.pl >@@ -38,13 +38,15 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ > debug => 1, > }); > >- >-my $batch_id = $cgi->param('batch_id') if $cgi->param('batch_id'); >+my $batch_id; >+my @label_ids; >+my @item_numbers; >+$batch_id = $cgi->param('batch_id') if $cgi->param('batch_id'); > my $template_id = $cgi->param('template_id') || undef; > my $layout_id = $cgi->param('layout_id') || undef; > my $start_label = $cgi->param('start_label') || 1; >-my @label_ids = $cgi->param('label_id') if $cgi->param('label_id'); >-my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); >+@label_ids = $cgi->param('label_id') if $cgi->param('label_id'); >+@item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); > > my $items = undef; > >diff --git a/labels/label-create-xml.pl b/labels/label-create-xml.pl >index dd83f1d..7b108ce 100755 >--- a/labels/label-create-xml.pl >+++ b/labels/label-create-xml.pl >@@ -1,5 +1,23 @@ > #!/usr/bin/perl > >+# Copyright Koha development team 2011 >+# >+# This file is part of Koha. >+# >+# Koha is free software; you can redistribute it and/or modify it under the >+# terms of the GNU General Public License as published by the Free Software >+# Foundation; either version 2 of the License, or (at your option) any later >+# version. >+# >+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >+# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# >+# You should have received a copy of the GNU General Public License along with >+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, >+# Suite 330, Boston, MA 02111-1307 USA >+# >+ > use strict; > use warnings; > >@@ -13,11 +31,14 @@ use C4::Labels 1.000000; > > my $cgi = new CGI; > >-my $batch_id = $cgi->param('batch_id') if $cgi->param('batch_id'); >+my $batch_id; >+my @labels_id; >+my @item_numbers; >+$batch_id = $cgi->param('batch_id') if $cgi->param('batch_id'); > my $template_id = $cgi->param('template_id') || undef; > my $layout_id = $cgi->param('layout_id') || undef; >-my @label_ids = $cgi->param('label_id') if $cgi->param('label_id'); >-my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); >+@label_ids = $cgi->param('label_id') if $cgi->param('label_id'); >+@item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); > > my $items = undef; > >diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl >index 8740c57..fbcfe0a 100755 >--- a/labels/label-edit-batch.pl >+++ b/labels/label-edit-batch.pl >@@ -56,10 +56,13 @@ my $display_columns = [ {_label_number => {label => 'Label Number', link_field > {select => {label => 'Select', value => '_label_id'}}, > ]; > my $op = $cgi->param('op') || 'edit'; >+my @label_ids; >+my @item_numbers; >+my $barcode; > my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || undef; >-my @label_ids = $cgi->param('label_id') if $cgi->param('label_id'); >-my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); >-my $barcode = $cgi->param('barcode') if $cgi->param('barcode'); >+@label_ids = $cgi->param('label_id') if $cgi->param('label_id'); >+@item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); >+$barcode = $cgi->param('barcode') if $cgi->param('barcode'); > > my $branch_code = C4::Context->userenv->{'branch'}; > >-- >1.7.5.4
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 6679
:
4883
|
4884
|
4885
|
4886
|
4887
|
4888
|
5445
|
5446
|
5483
|
5487
|
6121
|
6122
|
6123
|
6139
|
6140
|
6141
|
6142
|
6143
|
6144
|
6270
|
6271
|
6663
|
6670
|
6675
|
6676
|
6677
|
6678
|
8542
|
8897
|
8898
|
8899
|
8950
|
8951
|
9746
|
9747
|
9748
|
9749
|
9750
|
10050
|
10051
|
10052
|
10053
|
10054
|
10075
|
10076
|
10077
|
10078
|
10079
|
10484
|
10485
|
10486
|
10487
|
10488
|
10489
|
10491
|
10492
|
10493
|
10494
|
10495
|
10496
|
10497
|
10499
|
10500
|
10501
|
10502
|
10503
|
10504
|
10505
|
10506
|
10507
|
10508
|
10509
|
10510
|
10512
|
10513
|
10514
|
10515
|
10517
|
10521
|
10522
|
10523
|
10524
|
10525
|
10526
|
10527
|
10935
|
10936
|
10938
|
10940
|
10944
|
10945
|
10946
|
10947
|
10948
|
10949
|
10950
|
10952
|
10953
|
10955
|
10957
|
10958
|
10959
|
10960
|
10961
|
10962
|
10963
|
10964
|
10965
|
10966
|
10967
|
10972
|
10976
|
10979
|
10980
|
10981
|
12224
|
12363
|
12490
|
12491
|
12492
|
34191
|
34192
|
34193
|
34194
|
34195
|
34196
|
34197
|
39100
|
39101
|
39102
|
39392
|
39393
|
39394
|
39395
|
39396
|
39397
|
39398
|
42770
|
47086
|
47087
|
47088
|
47089
|
47090
|
47178
|
47179
|
47180
|
47181
|
47205
|
47206
|
47207
|
47208