Browse Source

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

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

JD amended patch, fix:
 FAIL   C4/RotatingCollections.pm
   FAIL   pod
        *** WARNING: line containing nothing but whitespace in paragraph  in file C4/RotatingCollections.pm

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
20.11.x
Martin Renvoize 10 months ago
committed by Jonathan Druart
parent
commit
bea17b4975
  1. 4
      C4/Reserves.pm
  2. 15
      C4/RotatingCollections.pm
  3. 6
      C4/SIP/ILS/Item.pm
  4. 2
      C4/SIP/ILS/Transaction/Checkout.pm

4
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;

15
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,8 +232,8 @@ 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

6
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);

2
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

Loading…
Cancel
Save