Attachment 111500 Details for Bug 12556 – Bug 12556: (QA follow-up) Fix QA Script failures

[patch] Bug 12556: (QA follow-up) Fix QA Script failures

Bug-12556-QA-follow-up-Fix-QA-Script-failures.patch (text/plain), 4.51 KB, created by Martin Renvoize (ashimema) on 2020-10-12 10:39:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-10-12 10:39:37 UTC

Size: 4.51 KB

patch

obsolete

>From 919da3839d49b9556be0308f901f1e4b0ea8281a Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 12 Oct 2020 11:06:51 +0100
>Subject: [PATCH] Bug 12556: (QA follow-up) Fix QA Script failures
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Reserves.pm                     |  4 ++--
> C4/RotatingCollections.pm          | 13 ++++++++-----
> C4/SIP/ILS/Item.pm                 |  6 +++---
> C4/SIP/ILS/Transaction/Checkout.pm |  2 +-
> 4 files changed, 14 insertions(+), 11 deletions(-)
>
>diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>index 73e0f767c1..d971324f1b 100644
>--- a/C4/Reserves.pm
>+++ b/C4/Reserves.pm
>@@ -830,9 +830,9 @@ sub CheckReserves {
>                 if ($res->{'found'} eq 'W') {
>                     return ( "Waiting", $res, \@reserves ); # Found it, it is waiting
>                 } elsif ($res->{'found'} eq 'P') {
>-                    return ( "Processing", $res, \@reserves ); # Found determinated hold, e. g. the tranferred one
>+                    return ( "Processing", $res, \@reserves ); # Found determinated hold, e. g. the transferred one
>                  } else {
>-                    return ( "Reserved", $res, \@reserves ); # Found determinated hold, e. g. the tranferred one
>+                    return ( "Reserved", $res, \@reserves ); # Found determinated hold, e. g. the transferred one
>                 }
>             } else {
>                 my $patron;
>diff --git a/C4/RotatingCollections.pm b/C4/RotatingCollections.pm
>index 954c2d419b..17cc9fdd8e 100644
>--- a/C4/RotatingCollections.pm
>+++ b/C4/RotatingCollections.pm
>@@ -67,7 +67,8 @@ BEGIN {
> 
> =head2  CreateCollection
>  ( $success, $errorcode, $errormessage ) = CreateCollection( $title, $description );
>- Creates a new collection
>+
>+Creates a new collection
> 
>  Input:
>    $title: short description of the club or service
>@@ -166,7 +167,8 @@ sub UpdateCollection {
> =head2 DeleteCollection
> 
>  ( $success, $errorcode, $errormessage ) = DeleteCollection( $colId );
>- Deletes a collection of the given id
>+
>+Deletes a collection of the given id
> 
>  Input:
>    $colId : id of the Archetype to be deleted
>@@ -199,7 +201,8 @@ sub DeleteCollection {
> =head2 GetCollections
> 
>  $collections = GetCollections();
>- Returns data about all collections
>+
>+Returns data about all collections
> 
>  Output:
>   On Success:
>@@ -229,7 +232,7 @@ sub GetCollections {
> 
>  ( $results, $success, $errorcode, $errormessage ) = GetItemsInCollection( $colId );
> 
>- Returns information about the items in the given collection
>+Returns information about the items in the given collection
>  
>  Input:
>    $colId: The id of the collection
>@@ -510,7 +513,7 @@ sub isItemInThisCollection {
> 
> =head2 isItemInAnyCollection
> 
>-$inCollection = isItemInAnyCollection( $itemnumber );
>+  my $inCollection = isItemInAnyCollection( $itemnumber );
> 
> =cut
> 
>diff --git a/C4/SIP/ILS/Item.pm b/C4/SIP/ILS/Item.pm
>index 510fe09524..e787ed1aee 100644
>--- a/C4/SIP/ILS/Item.pm
>+++ b/C4/SIP/ILS/Item.pm
>@@ -316,7 +316,7 @@ sub pending_queue {
> }
> sub hold_attached {
>     my $self = shift;
>-	(defined $self->{hold_attached}) or return [];
>+    (defined $self->{hold_attached}) or return [];
>     return $self->{hold_attached};
> }
> 
>@@ -371,8 +371,8 @@ sub hold_pickup_date {
> sub available {
> 	my ($self, $for_patron) = @_;
> 	my $count  = (defined $self->{pending_queue}) ? scalar @{$self->{pending_queue}} : 0;
>-	my $count2 = (defined $self->{hold_attached}   ) ? scalar @{$self->{hold_attached}   } : 0;
>-	$debug and print STDERR "availability check: pending_queue size $count, hold_attached size $count2\n";
>+    my $count2 = (defined $self->{hold_attached}   ) ? scalar @{$self->{hold_attached}   } : 0;
>+    $debug and print STDERR "availability check: pending_queue size $count, hold_attached size $count2\n";
>     if (defined($self->{borrowernumber})) {
>         ($self->{borrowernumber} eq $for_patron) or return 0;
> 		return ($count ? 0 : 1);
>diff --git a/C4/SIP/ILS/Transaction/Checkout.pm b/C4/SIP/ILS/Transaction/Checkout.pm
>index ac2e4b8980..aabe5e6830 100644
>--- a/C4/SIP/ILS/Transaction/Checkout.pm
>+++ b/C4/SIP/ILS/Transaction/Checkout.pm
>@@ -48,7 +48,7 @@ sub new {
> sub do_checkout {
> 	my $self = shift;
> 	siplog('LOG_DEBUG', "ILS::Transaction::Checkout performing checkout...");
>-	my $shelf          = $self->{item}->hold_attached;
>+    my $shelf          = $self->{item}->hold_attached;
> 	my $barcode        = $self->{item}->id;
>     my $patron         = Koha::Patrons->find($self->{patron}->{borrowernumber});
>     my $overridden_duedate; # usually passed as undef to AddIssue
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 12556: 107181 | 107182 | 107183 | 107184 | 107185 | 107186 | 108711 | 109140 | 109924 | 109925 | 109926 | 109927 | 109928 | 109929 | 110719 | 110942 | 110943 | 110944 | 110945 | 110946 | 110947 | 110948 | 110949 | 110950 | 110951 | 110952 | 110953 | 110954 | 110955 | 110956 | 110961 | 110962 | 110963 | 110964 | 110965 | 110966 | 111405 | 111406 | 111407 | 111408 | 111409 | 111410 | 111494 | 111495 | 111496 | 111497 | 111498 | 111499 | 111500 | 111509 | 111516 | 111585 | 111610