Bugzilla – Attachment 4888 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 : scripts under admin style fixed
Bug-6679--scripts-under-admin-style-fixed.patch (text/plain), 3.70 KB, created by
Chris Cormack
on 2011-08-08 09:43:04 UTC
(
hide
)
Description:
Bug 6679 : scripts under admin style fixed
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2011-08-08 09:43:04 UTC
Size:
3.70 KB
patch
obsolete
>From 326ae9e8736f515aaee35312cbd90b4c10757eb6 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Mon, 8 Aug 2011 21:35:32 +1200 >Subject: [PATCH] Bug 6679 : scripts under admin style fixed > >Contrary to common belief, subroutine prototypes do not enable >compile-time checks for proper arguments. Don't use them. > >Defining a named sub within another sub, does not prevent that >subroutine being global >--- > admin/authorised_values.pl | 2 +- > admin/preferences.pl | 19 +++++++++---------- > t/00-testcritic.t | 2 +- > 3 files changed, 11 insertions(+), 12 deletions(-) > >diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl >index c26f3a9..d7872d6 100755 >--- a/admin/authorised_values.pl >+++ b/admin/authorised_values.pl >@@ -27,7 +27,7 @@ use C4::Koha; > use C4::Output; > > >-sub AuthorizedValuesForCategory ($) { >+sub AuthorizedValuesForCategory { > my ($searchstring) = shift or return; > my $dbh = C4::Context->dbh; > $searchstring=~ s/\'/\\\'/g; >diff --git a/admin/preferences.pl b/admin/preferences.pl >index d523c75..f4d1823 100755 >--- a/admin/preferences.pl >+++ b/admin/preferences.pl >@@ -194,12 +194,6 @@ sub SearchPrefs { > my %tab_files = _get_pref_files( $input ); > our @terms = split( /\s+/, $searchfield ); > >- sub matches { >- my ( $text ) = @_; >- >- return !grep( { $text !~ /$_/i } @terms ); >- } >- > foreach my $tab_name ( keys %tab_files ) { > my $data = GetTab( $input, $tab_name ); > my $title = ( keys( %$data ) )[0]; >@@ -209,7 +203,7 @@ sub SearchPrefs { > my $matched_groups; > > while ( my ( $group_title, $contents ) = each %$tab ) { >- if ( matches( $group_title ) ) { >+ if ( matches( $group_title, \@terms ) ) { > $matched_groups->{$group_title} = $contents; > next; > } >@@ -225,12 +219,12 @@ sub SearchPrefs { > my ( undef, $LINES ) = TransformPrefsToHTML( $data, $searchfield ); > > return { search_jumped => 1, tab => $tab_name, tab_title => $title, LINES => $LINES }; >- } elsif ( matches( $piece->{'pref'} ) ) { >+ } elsif ( matches( $piece->{'pref'}, \@terms) ) { > $matched = 1; >- } elsif ( ref( $piece->{'choices'} ) eq 'HASH' && grep( { $_ && matches( $_ ) } values( %{ $piece->{'choices'} } ) ) ) { >+ } elsif ( ref( $piece->{'choices'} ) eq 'HASH' && grep( { $_ && matches( $_, \@terms ) } values( %{ $piece->{'choices'} } ) ) ) { > $matched = 1; > } >- } elsif ( matches( $piece ) ) { >+ } elsif ( matches( $piece, \@terms ) ) { > $matched = 1; > } > last if ( $matched ); >@@ -252,6 +246,11 @@ sub SearchPrefs { > return @tabs; > } > >+sub matches { >+ my ( $text, $terms ) = @_; >+ return !grep( { $text !~ /$_/i } @$terms ); >+} >+ > my $dbh = C4::Context->dbh; > our $input = new CGI; > >diff --git a/t/00-testcritic.t b/t/00-testcritic.t >index 4a285b3..bc7a3cd 100755 >--- a/t/00-testcritic.t >+++ b/t/00-testcritic.t >@@ -16,7 +16,7 @@ my @all_koha_dirs = qw( acqui admin authorities basket C4 catalogue cataloguing > labels members misc offline_circ opac patroncards reports reserve reviews rotating_collections > serials sms suggestion t tags test tools virtualshelves); > >-my @dirs = qw( acqui basket circ debian errors offline_circ reserve reviews rotating_collections >+my @dirs = qw( acqui admin basket circ debian errors offline_circ reserve reviews rotating_collections > serials sms virtualshelves ); > > if ( not $ENV{TEST_QA} ) { >-- >1.7.4.1
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