Bug 39866: Acquisitions statistics fails when filling only the To date
This patch fixes the exection of the report Acquisitions statistics if you fill only the To date Test plan: 1 Execute the report Acquisitions statistics filling only To date filter in Placed on or Received on (/cgi-bin/koha/reports/acquisitions_stats.pl) Koha returns an Internal Server Error 2 Apply patch, restart services 3 Repeat step 1, now the report returns the results page as expected Signed-off-by: Roman Dolny <roman.dolny@jezuici.pl> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> [EDIT] Removed superfluous COALESCEs. Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
parent
300247d2c6
commit
856a85d3af
|
|
@ -310,10 +310,12 @@ sub calculate {
|
|||
$strsth .= " ORDER BY $line";
|
||||
|
||||
my $sth = $dbh->prepare($strsth);
|
||||
if ( (@linefilter) and ( $linefilter[1] ) ) {
|
||||
if ( (@linefilter) and ( $linefilter[0] && $linefilter[1] ) ) {
|
||||
$sth->execute( $linefilter[0], $linefilter[1] );
|
||||
} elsif ( $linefilter[0] ) {
|
||||
$sth->execute( $linefilter[0] );
|
||||
} elsif ( $linefilter[1] ) {
|
||||
$sth->execute( $linefilter[1] );
|
||||
} else {
|
||||
$sth->execute;
|
||||
}
|
||||
|
|
@ -364,10 +366,12 @@ sub calculate {
|
|||
|
||||
my $sth2 = $dbh->prepare($strsth2);
|
||||
|
||||
if ( (@colfilter) and ( $colfilter[1] ) ) {
|
||||
if ( (@colfilter) and ( $colfilter[0] and $colfilter[1] ) ) {
|
||||
$sth2->execute( $colfilter[0], $colfilter[1] );
|
||||
} elsif ( $colfilter[0] ) {
|
||||
$sth2->execute( $colfilter[0] );
|
||||
} elsif ( $colfilter[1] ) {
|
||||
$sth2->execute( $colfilter[1] );
|
||||
} else {
|
||||
$sth2->execute;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue