Bug 6555 : only 10 lists show in the staff client
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
parent
6c0962f06b
commit
e23608a1f9
2 changed files with 9 additions and 5 deletions
|
@ -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({});
|
||||
|
|
|
@ -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};
|
||||
|
|
Loading…
Reference in a new issue