From: Chris Cormack <[email protected]>
Signed-off-by: Nicole C. Engard <[email protected]>
---
C4/VirtualShelves.pm | 10 +++++++---
virtualshelves/addbybiblionumber.pl | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm
index df54de8..57b86da 100644
--- a/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@ -203,15 +203,19 @@ sub GetRecentShelves {
my @params;
my $selection;
if (defined $owner) {
- @params = ($owner, $mincategory, $row_count);
+ @params = ($owner, $mincategory);
$selection = ' WHERE owner = ? AND category = ?';
} else {
- @params = ( $mincategory, $row_count);
+ @params = ( $mincategory);
$selection = ' WHERE category >= ? ';
}
my $query = 'SELECT * FROM virtualshelves';
$query .= $selection;
- $query .= ' ORDER BY lastmodified DESC LIMIT ?';
+ $query .= ' ORDER BY lastmodified DESC';
+ if ($row_count){
+ $query .= ' LIMIT ?';
+ push @params,$row_count;
+ }
my $sth = $dbh->prepare($query);
$sth->execute(@params);
my $shelflist = $sth->fetchall_arrayref({});
diff --git a/virtualshelves/addbybiblionumber.pl
b/virtualshelves/addbybiblionumber.pl
index f1ac674..1dbffbb 100755
--- a/virtualshelves/addbybiblionumber.pl
+++ b/virtualshelves/addbybiblionumber.pl
@@ -152,14 +152,14 @@ if ( $shelfnumber || ( $shelfnumber == -1 ) ) { # the
shelf already exist.
}
}
else { # this shelf doesn't already exist.
- my $limit = 10;
+# my $limit = 10;
my ($shelflist);
my @shelvesloop;
my %shelvesloop;
#grab each type of shelf, open (type 3) should not be limited by user.
foreach my $shelftype (1,2,3) {
- my ($shelflist) = GetRecentShelves($shelftype, $limit, $shelftype
== 3 ? undef : $loggedinuser);
+ my ($shelflist) = GetRecentShelves($shelftype, undef, $shelftype ==
3 ? undef : $loggedinuser);
for my $shelf (@{ $shelflist }) {
push(@shelvesloop, $shelf->{shelfnumber});
$shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname};
--
1.7.2.3
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
