use Modern::Perl;
use CGI qw ( -utf8 );
-use C4::VirtualShelves;
use C4::Auth;
use C4::Biblio;
use C4::Csv;
} elsif ( $op eq 'add' ) {
eval {
$shelf = Koha::Virtualshelf->new(
- { shelfname => $query->param('shelfname'),
- sortfield => $query->param('sortfield'),
- category => $query->param('category'),
- allow_add => $query->param('allow_add'),
- allow_delete_own => $query->param('allow_delete_own'),
- allow_delete_other => $query->param('allow_delete_other'),
- owner => $query->param('owner'),
+ { shelfname => scalar $query->param('shelfname'),
+ sortfield => scalar $query->param('sortfield'),
+ category => scalar $query->param('category'),
+ allow_add => scalar $query->param('allow_add'),
+ allow_delete_own => scalar $query->param('allow_delete_own'),
+ allow_delete_other => scalar $query->param('allow_delete_other'),
+ owner => scalar $query->param('owner'),
}
);
$shelf->store;
if ( $shelf ) {
$op = $referer;
if ( $shelf->can_be_managed( $loggedinuser ) ) {
- $shelf->shelfname( $query->param('shelfname') );
- $shelf->sortfield( $query->param('sortfield') );
- $shelf->allow_add( $query->param('allow_add') );
- $shelf->allow_delete_own( $query->param('allow_delete_own') );
- $shelf->allow_delete_other( $query->param('allow_delete_other') );
- $shelf->category( $query->param('category') );
+ $shelf->shelfname( scalar $query->param('shelfname') );
+ $shelf->sortfield( scalar $query->param('sortfield') );
+ $shelf->allow_add( scalar $query->param('allow_add') );
+ $shelf->allow_delete_own( scalar $query->param('allow_delete_own') );
+ $shelf->allow_delete_other( scalar $query->param('allow_delete_other') );
+ $shelf->category( scalar $query->param('category') );
eval { $shelf->store };
if ($@) {
} elsif ( $op eq 'remove_biblios' ) {
$shelfnumber = $query->param('shelfnumber');
$shelf = Koha::Virtualshelves->find($shelfnumber);
- my @biblionumbers = $query->param('biblionumber');
+ my @biblionumbers = $query->multi_param('biblionumber');
if ($shelf) {
if ( $shelf->can_biblios_be_removed( $loggedinuser ) ) {
my $number_of_biblios_removed = eval {
$shelf = Koha::Virtualshelves->find($shelfnumber);
if ( $shelf ) {
if ( $shelf->can_be_viewed( $loggedinuser ) ) {
- my $sortfield = $query->param('sortfield') || $shelf->sortfield; # Passed in sorting overrides default sorting
+ my $sortfield = $query->param('sortfield') || $shelf->sortfield || 'title'; # Passed in sorting overrides default sorting
my $direction = $query->param('direction') || 'asc';
- my ( $shelflimit, $shelfoffset, $itemoff );
+ $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
+ my ( $rows, $page );
unless ( $query->param('print') ) {
- $shelflimit = C4::Context->preference('numSearchResults') || 20;
- $itemoff = ( $query->param('itemoff') ? $query->param('itemoff') : 1 );
- $shelfoffset = ( $itemoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving items at
+ $rows = C4::Context->preference('numSearchResults') || 20;
+ $page = ( $query->param('page') ? $query->param('page') : 1 );
}
- my ( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset, $sortfield, $direction );
+
+ my $order_by = $sortfield eq 'itemcallnumber' ? 'items.itemcallnumber' : $sortfield;
+ my $contents = $shelf->get_contents->search(
+ {},
+ {
+ prefetch => [ { 'biblionumber' => { 'biblioitems' => 'items' } } ],
+ page => $page,
+ rows => $rows,
+ order_by => { "-$direction" => $order_by },
+ }
+ );
my $borrower = GetMember( borrowernumber => $loggedinuser );
- for my $this_item (@$items) {
- my $biblionumber = $this_item->{biblionumber};
+ my @items;
+ while ( my $content = $contents->next ) {
+ my $this_item;
+ my $biblionumber = $content->biblionumber->biblionumber;
my $record = GetMarcBiblio($biblionumber);
if ( C4::Context->preference("XSLTResultsDisplay") ) {
}
my $marcflavour = C4::Context->preference("marcflavour");
- $this_item->{'imageurl'} = getitemtypeinfo( $this_item->{'itemtype'}, 'intranet' )->{'imageurl'};
+ my $itemtypeinfo = getitemtypeinfo( $content->biblionumber->biblioitems->first->itemtype, 'intranet' );
+ $this_item->{author} = $content->biblionumber->author;
+ $this_item->{dateadded} = $content->dateadded;
+ $this_item->{imageurl} = $itemtypeinfo->{imageurl};
+ $this_item->{description} = $itemtypeinfo->{description};
+ $this_item->{notforloan} = $itemtypeinfo->{notforloan};
$this_item->{'coins'} = GetCOinSBiblio($record);
- $this_item->{'subtitle'} = GetRecordValue( 'subtitle', $record, GetFrameworkCode( $this_item->{'biblionumber'} ) );
+ $this_item->{'subtitle'} = GetRecordValue( 'subtitle', $record, GetFrameworkCode( $biblionumber ) );
$this_item->{'normalized_upc'} = GetNormalizedUPC( $record, $marcflavour );
$this_item->{'normalized_ean'} = GetNormalizedEAN( $record, $marcflavour );
$this_item->{'normalized_oclc'} = GetNormalizedOCLCNumber( $record, $marcflavour );
}
# Getting items infos for location display
- my @items_infos = &GetItemsLocationInfo( $this_item->{'biblionumber'} );
+ my @items_infos = &GetItemsLocationInfo( $biblionumber );
$this_item->{'ITEM_RESULTS'} = \@items_infos;
+ $this_item->{biblionumber} = $biblionumber;
+ push @items, $this_item;
}
- # Build drop-down list for 'Add To:' menu...
- my ( $totalref, $pubshelves, $barshelves ) = C4::VirtualShelves::GetSomeShelfNames( $loggedinuser, 'COMBO', 1 );
+ my $some_private_shelves = Koha::Virtualshelves->get_some_shelves(
+ {
+ borrowernumber => $loggedinuser,
+ add_allowed => 1,
+ category => 1,
+ }
+ );
+ my $some_public_shelves = Koha::Virtualshelves->get_some_shelves(
+ {
+ borrowernumber => $loggedinuser,
+ add_allowed => 1,
+ category => 2,
+ }
+ );
+
$template->param(
- addbarshelves => $totalref->{bartotal},
- addbarshelvesloop => $barshelves,
- addpubshelves => $totalref->{pubtotal},
- addpubshelvesloop => $pubshelves,
+ add_to_some_private_shelves => $some_private_shelves,
+ add_to_some_public_shelves => $some_public_shelves,
can_manage_shelf => $shelf->can_be_managed($loggedinuser),
can_remove_shelf => $shelf->can_be_deleted($loggedinuser),
can_remove_biblios => $shelf->can_biblios_be_removed($loggedinuser),
can_add_biblios => $shelf->can_biblios_be_added($loggedinuser),
sortfield => $sortfield,
- itemsloop => $items,
+ itemsloop => \@items,
sortfield => $sortfield,
direction => $direction,
);
- if ($shelflimit) {
+ if ( $page ) {
+ my $pager = $contents->pager;
$template->param(
pagination_bar => pagination_bar(
- q||, ( int( $totitems / $shelflimit ) ) + ( ( $totitems % $shelflimit ) > 0 ? 1 : 0 ),
- $itemoff, "itemoff", { op => 'view', shelfnumber => $shelf->shelfnumber, sortfield => $sortfield, direction => $direction, }
+ q||, $pager->last_page - $pager->first_page + 1,
+ $page, "page", { op => 'view', shelfnumber => $shelf->shelfnumber, sortfield => $sortfield, direction => $direction, }
),
);
}
shelf => $shelf,
messages => \@messages,
category => $category,
- print => $query->param('print') || 0,
+ print => scalar $query->param('print') || 0,
csv_profiles => GetCsvProfilesLoop('marc'),
);
projects / koha.git / blobdiff