Attachment 21433 Details for Bug 6874 – [SIGNED-OFF] Bug 6874: QA follow-up

[patch] [SIGNED-OFF] Bug 6874: QA follow-up

Bug-6874-QA-follow-up.patch (text/plain), 3.95 KB, created by Julian Maurice on 2013-09-25 07:09:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2013-09-25 07:09:18 UTC

Size: 3.95 KB

patch

obsolete

>From 4b102c00991e74d328e7bb0632b5f769cc1f565d Mon Sep 17 00:00:00 2001
>From: Paul Poulain <paul.poulain@biblibre.com>
>Date: Tue, 19 Mar 2013 10:48:08 +0100
>Subject: [PATCH] Bug 6874: QA follow-up
>
>Squash of the following commits:
>  return with explicit undef removed
>  Follow-up for PBP fixes
>  follow-up fix POD syntax
>  follow-up jquery has moved
>
>Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
>Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
>---
> C4/Biblio.pm                                         |   18 +++++++++++-------
> C4/UploadedFiles.pm                                  |    2 +-
> cataloguing/value_builder/upload.pl                  |    2 +-
> .../en/modules/cataloguing/value_builder/upload.tt   |    2 +-
> opac/opac-retrieve-file.pl                           |    4 ++--
> 5 files changed, 16 insertions(+), 12 deletions(-)
>
>diff --git a/C4/Biblio.pm b/C4/Biblio.pm
>index 4997d89..20e64e1 100644
>--- a/C4/Biblio.pm
>+++ b/C4/Biblio.pm
>@@ -1446,13 +1446,14 @@ sub GetCOinSBiblio {
> =head2 GetMarcPrice
> 
> return the prices in accordance with the Marc format.
>+
> =cut
> 
> sub GetMarcPrice {
>     my ( $record, $marcflavour ) = @_;
>     my @listtags;
>     my $subfield;
>-    
>+
>     if ( $marcflavour eq "MARC21" ) {
>         @listtags = ('345', '020');
>         $subfield="c";
>@@ -3393,8 +3394,9 @@ sub get_biblio_authorised_values {
> 
> =head2 CountBiblioInOrders
> 
>-=over 4
>-$count = &CountBiblioInOrders( $biblionumber);
>+=over
>+
>+=item $count = &CountBiblioInOrders( $biblionumber);
> 
> =back
> 
>@@ -3416,8 +3418,9 @@ sub CountBiblioInOrders {
> 
> =head2 GetSubscriptionsId
> 
>-=over 4
>-$subscriptions = &GetSubscriptionsId($biblionumber);
>+=over
>+
>+=item $subscriptions = &GetSubscriptionsId($biblionumber);
> 
> =back
> 
>@@ -3439,8 +3442,9 @@ sub GetSubscriptionsId {
> 
> =head2 GetHolds
> 
>-=over 4
>-$holds = &GetHolds($biblionumber);
>+=over
>+
>+=item $holds = &GetHolds($biblionumber);
> 
> =back
> 
>diff --git a/C4/UploadedFiles.pm b/C4/UploadedFiles.pm
>index 246b02b..1574e99 100644
>--- a/C4/UploadedFiles.pm
>+++ b/C4/UploadedFiles.pm
>@@ -180,7 +180,7 @@ sub UploadFile {
>         return $id;
>     }
> 
>-    return undef;
>+    return;
> }
> 
> =head2 DelUploadedFile
>diff --git a/cataloguing/value_builder/upload.pl b/cataloguing/value_builder/upload.pl
>index 0cb33f4..03ad77b 100755
>--- a/cataloguing/value_builder/upload.pl
>+++ b/cataloguing/value_builder/upload.pl
>@@ -140,7 +140,7 @@ sub finddirs {
>     my $base = shift || $upload_path;
>     my $found = 0;
>     my @dirs;
>-    my @files = <$base/*>;
>+    my @files = glob("$base/*");
>     foreach (@files) {
>         if (-d $_ and -w $_) {
>             my $lastdirname = basename($_);
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
>index 4fae58a..da40360 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
>@@ -4,7 +4,7 @@
> <head>
>     <title>Upload plugin</title>
>     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-    <script type="text/javascript" src="[% themelang %]/lib/jquery/jquery.js"></script>
>+    <script type="text/javascript" src="/intranet-tmpl/lib/jquery/jquery.js"></script>
>     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
> 
> </head>
>diff --git a/opac/opac-retrieve-file.pl b/opac/opac-retrieve-file.pl
>index ddbf1ac..d5406e6 100755
>--- a/opac/opac-retrieve-file.pl
>+++ b/opac/opac-retrieve-file.pl
>@@ -32,12 +32,12 @@ exit 1 if not $file;
> my $file_path = $file->{filepath};
> 
> if( -f $file_path ) {
>-    open FH, '<', $file_path or die "Can't open file: $!";
>+    open my $fh, '<', $file_path or die "Can't open file: $!";
>     print $input->header(
>         -type => "application/octet-stream",
>         -attachment => $file->{filename}
>     );
>-    while(<FH>) {
>+    while(<$fh>) {
>         print $_;
>     }
> } else {
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 6874: 5439 | 5440 | 5764 | 7114 | 7980 | 8234 | 8468 | 10664 | 10673 | 10863 | 10982 | 11098 | 11634 | 12355 | 12356 | 12357 | 12358 | 14130 | 14131 | 14132 | 14133 | 16343 | 16354 | 16355 | 16356 | 16357 | 16370 | 16693 | 16694 | 16695 | 16696 | 16697 | 16698 | 16699 | 16712 | 16713 | 16714 | 16715 | 16716 | 16717 | 16718 | 16719 | 17368 | 17369 | 18767 | 18768 | 18769 | 18770 | 18771 | 18772 | 18773 | 18774 | 18775 | 18776 | 18777 | 18891 | 18892 | 18893 | 18894 | 20059 | 20060 | 20779 | 21432 | 21433 | 21434 | 21435 | 21436 | 21489 | 21543 | 21546 | 21635 | 21798 | 21799 | 21800 | 21801 | 21802 | 21803 | 23588 | 23589 | 23590 | 23591 | 23607 | 23608 | 23609 | 23610 | 23611 | 23612 | 23613 | 26418 | 26419 | 26420 | 26421 | 26422 | 26423 | 26424 | 26878 | 26879 | 26880 | 26881 | 26882 | 26883 | 26884 | 27114 | 27125 | 27154 | 27155 | 27225 | 30362 | 30363 | 30364 | 30365 | 30366 | 30367 | 30368 | 30369 | 30370 | 30371 | 32384 | 32385 | 32386 | 32387 | 32388 | 32389 | 32390 | 32391 | 32392 | 32393 | 36198 | 36199 | 36200 | 36201 | 36202 | 36203 | 36204 | 36205 | 36206 | 36207 | 36208 | 36209 | 36210 | 36211 | 36213 | 36214 | 36215 | 36216 | 36217 | 36218 | 36219 | 36220 | 36221 | 36222 | 36223 | 36224 | 36225 | 36226 | 36227 | 36228 | 36229 | 36230 | 36231 | 36232 | 37681 | 37682 | 37683 | 37684 | 37685 | 37686 | 37687 | 37688 | 37689 | 37690 | 37691 | 37692 | 37693 | 37694 | 37696 | 37697 | 37698 | 37699 | 37700 | 37701 | 37702 | 37703 | 37704 | 37705 | 37706 | 38911 | 38912 | 38913 | 38914 | 38915 | 38916 | 38917 | 38918 | 38919 | 38920 | 38921 | 38922 | 38923 | 38924 | 38925 | 38926 | 38927 | 38928 | 38929 | 38930 | 38931 | 38932 | 38933 | 38934 | 38935 | 38936 | 39113 | 39114 | 39115 | 39116 | 39117 | 39118 | 39119 | 39120 | 39121 | 39122 | 39123 | 39626 | 39627 | 39628 | 39629 | 39630 | 39631 | 39632 | 39633 | 39634 | 39635 | 39636 | 39637 | 39638 | 41275 | 41276 | 41277 | 41278 | 41279 | 41280 | 41281 | 41282 | 41283 | 41284 | 41285 | 41286 | 41287 | 41288 | 41448 | 41449 | 41450 | 41783