- my $privateshelves = GetAllShelves(1,$loggedinuser,1);
- my $publicshelves = GetAllShelves(2,$loggedinuser,1);
- $template->param(
- privatevirtualshelves => $privateshelves,
- publicvirtualshelves => $publicshelves,
+ my $private_shelves = Koha::Virtualshelves->search(
+ {
+ category => 1,
+ owner => $loggedinuser,
+ },
+ { order_by => 'shelfname' }
+ );
+ my $shelves_shared_with_me = Koha::Virtualshelves->search(
+ {
+ category => 1,
+ 'virtualshelfshares.borrowernumber' => $loggedinuser,
+ -or => {
+ allow_add => 1,
+ owner => $loggedinuser,
+ }
+ },
+ {
+ join => 'virtualshelfshares',
+ }
+ );
+ my $public_shelves= Koha::Virtualshelves->search(
+ {
+ category => 2,
+ -or => {
+ allow_add => 1,
+ owner => $loggedinuser,
+ }
+ },
+ { order_by => 'shelfname' }
+ );
+ $template->param (
+ private_shelves => $private_shelves,
+ private_shelves_shared_with_me => $shelves_shared_with_me,
+ public_shelves => $public_shelves,