# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
+
use CGI qw ( -utf8 );
-use C4::VirtualShelves;
use C4::Auth;
use C4::Biblio;
use C4::Koha;
use C4::Output;
use C4::Tags qw( get_tags );
use C4::XSLT;
+
+use Koha::Biblios;
+use Koha::Biblioitems;
+use Koha::IssuingRules;
+use Koha::Items;
+use Koha::ItemTypes;
+use Koha::Patrons;
use Koha::Virtualshelves;
+use Koha::RecordProcessor;
+
+use constant ANYONE => 2;
my $query = new CGI;
my $template_name = $query->param('rss') ? "opac-shelves-rss.tt" : "opac-shelves.tt";
+# if virtualshelves is disabled, leave immediately
+if ( ! C4::Context->preference('virtualshelves') ) {
+ print $query->redirect("/cgi-bin/koha/errors/404.pl");
+ exit;
+}
+
my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
template_name => $template_name,
query => $query,
my ( $shelf, $shelfnumber, @messages );
if ( $op eq 'add_form' ) {
- # Nothing to do
+ # Only pass default
+ $shelf = { allow_change_from_owner => 1 };
} elsif ( $op eq 'edit_form' ) {
$shelfnumber = $query->param('shelfnumber');
$shelf = Koha::Virtualshelves->find($shelfnumber);
if ( $shelf ) {
$category = $shelf->category;
- my $patron = GetMember( 'borrowernumber' => $shelf->owner );
+ my $patron = Koha::Patrons->find( $shelf->owner );
$template->param( owner => $patron, );
unless ( $shelf->can_be_managed( $loggedinuser ) ) {
push @messages, { type => 'error', code => 'unauthorized_on_update' };
push @messages, { type => 'error', code => 'does_not_exist' };
}
} elsif ( $op eq 'add' ) {
- eval {
- $shelf = Koha::Virtualshelf->new(
- { shelfname => $query->param('shelfname'),
- sortfield => $query->param('sortfield'),
- category => $query->param('category') || 1,
- 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'),
- }
- );
- $shelf->store;
- $shelfnumber = $shelf->shelfnumber;
- };
- if ($@) {
- push @messages, { type => 'error', code => ref($@), msg => $@ };
- } elsif ( not $shelf ) {
- push @messages, { type => 'error', code => 'error_on_insert' };
+ if ( $loggedinuser ) {
+ my $allow_changes_from = $query->param('allow_changes_from');
+ eval {
+ $shelf = Koha::Virtualshelf->new(
+ { shelfname => scalar $query->param('shelfname'),
+ sortfield => scalar $query->param('sortfield'),
+ category => scalar $query->param('category') || 1,
+ allow_change_from_owner => $allow_changes_from > 0,
+ allow_change_from_others => $allow_changes_from == ANYONE,
+ owner => scalar $loggedinuser,
+ }
+ );
+ $shelf->store;
+ $shelfnumber = $shelf->shelfnumber;
+ };
+ if ($@) {
+ push @messages, { type => 'error', code => ref($@), msg => $@ };
+ } elsif ( not $shelf ) {
+ push @messages, { type => 'error', code => 'error_on_insert' };
+ } else {
+ push @messages, { type => 'message', code => 'success_on_insert' };
+ $op = 'view';
+ }
} else {
- push @messages, { type => 'message', code => 'success_on_insert' };
- $op = 'view';
+ push @messages, { type => 'error', code => 'unauthorized_on_insert' };
+ $op = 'list';
}
} elsif ( $op eq 'edit' ) {
$shelfnumber = $query->param('shelfnumber');
$shelf = Koha::Virtualshelves->find($shelfnumber);
if ( $shelf ) {
$op = $referer;
+ my $sortfield = $query->param('sortfield');
+ $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber dateadded );
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( $sortfield );
+ my $allow_changes_from = $query->param('allow_changes_from');
+ $shelf->allow_change_from_owner( $allow_changes_from > 0 );
+ $shelf->allow_change_from_others( $allow_changes_from == ANYONE );
+ $shelf->category( scalar $query->param('category') );
eval { $shelf->store };
if ($@) {
if( my $barcode = $query->param('barcode') ) {
my $item = GetItem( 0, $barcode);
if (defined $item && $item->{itemnumber}) {
- my $biblio = GetBiblioFromItemNumber( $item->{itemnumber} );
if ( $shelf->can_biblios_be_added( $loggedinuser ) ) {
- my $added = eval { $shelf->add_biblio( $biblio->{biblionumber}, $loggedinuser ); };
+ my $added = eval { $shelf->add_biblio( $item->{biblionumber}, $loggedinuser ); };
if ($@) {
push @messages, { type => 'error', code => ref($@), msg => $@ };
} elsif ( $added ) {
} elsif ( $op eq 'remove_biblios' ) {
$shelfnumber = $query->param('shelfnumber');
$shelf = Koha::Virtualshelves->find($shelfnumber);
- my @biblionumber = $query->param('biblionumber');
+ my @biblionumber = $query->multi_param('biblionumber');
if ($shelf) {
if ( $shelf->can_biblios_be_removed( $loggedinuser ) ) {
my $number_of_biblios_removed = eval {
if ( $shelf->can_be_viewed( $loggedinuser ) ) {
$category = $shelf->category;
my $sortfield = $query->param('sortfield') || $shelf->sortfield; # Passed in sorting overrides default sorting
+ $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber dateadded );
my $direction = $query->param('direction') || 'asc';
- my ( $shelflimit, $shelfoffset, $itemoff );
+ $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
+ my ( $page, $rows );
unless ( $query->param('print') or $query->param('rss') ) {
- $shelflimit = C4::Context->preference('OPACnumSearchResults') || 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('OPACnumSearchResults') || 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.cn_sort' : $sortfield;
+ my $contents = $shelf->get_contents->search(
+ {},
+ {
+ prefetch => [ { 'biblionumber' => { 'biblioitems' => 'items' } } ],
+ page => $page,
+ rows => $rows,
+ order_by => { "-$direction" => $order_by },
+ }
+ );
# get biblionumbers stored in the cart
my @cart_list;
@cart_list = split(/\//, $cart_list);
}
- my $borrower = GetMember( borrowernumber => $loggedinuser );
+ my $patron = Koha::Patrons->find( $loggedinuser );
+
+ # Lists display falls back to search results configuration
+ my $xslfile = C4::Context->preference('OPACXSLTListsDisplay');
+ my $lang = $xslfile ? C4::Languages::getlanguage() : undef;
+ my $sysxml = $xslfile ? C4::XSLT::get_xslt_sysprefs() : undef;
- for my $this_item (@$items) {
- my $biblionumber = $this_item->{biblionumber};
- my $record = GetMarcBiblio($biblionumber);
+ my $record_processor = Koha::RecordProcessor->new({ filters => 'ViewPolicy' });
+ my @items;
+ while ( my $content = $contents->next ) {
+ my $biblionumber = $content->biblionumber;
+ my $this_item = GetBiblioData($biblionumber);
+ my $record = GetMarcBiblio({ biblionumber => $biblionumber });
+ my $framework = GetFrameworkCode( $biblionumber );
+ my $biblio = Koha::Biblios->find( $biblionumber );
+ $record_processor->options({
+ interface => 'opac',
+ frameworkcode => $framework
+ });
+ $record_processor->process($record);
- if ( C4::Context->preference("OPACXSLTResultsDisplay") ) {
- $this_item->{XSLTBloc} = XSLTParse4Display( $biblionumber, $record, "OPACXSLTResultsDisplay" );
+ if ( $xslfile ) {
+ $this_item->{XSLTBloc} = XSLTParse4Display( $biblionumber, $record, "OPACXSLTListsDisplay",
+ 1, undef, $sysxml, $xslfile, $lang);
}
my $marcflavour = C4::Context->preference("marcflavour");
- $this_item->{'imageurl'} = getitemtypeinfo( $this_item->{'itemtype'}, 'intranet' )->{'imageurl'};
+ my $itemtype = Koha::Biblioitems->search({ biblionumber => $content->biblionumber })->next->itemtype;
+ $itemtype = Koha::ItemTypes->find( $itemtype );
+ if( $itemtype ) {
+ $this_item->{imageurl} = C4::Koha::getitemtypeimagelocation( 'opac', $itemtype->imageurl );
+ $this_item->{description} = $itemtype->description; #FIXME Should not it be translated_description?
+ $this_item->{notforloan} = $itemtype->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;
if (C4::Context->preference('TagsEnabled') and C4::Context->preference('TagsShowOnList')) {
$this_item->{TagLoop} = get_tags({
- biblionumber=>$this_item->{'biblionumber'}, approved=>1, 'sort'=>'-weight',
+ biblionumber => $biblionumber, approved=>1, 'sort'=>'-weight',
limit => C4::Context->preference('TagsShowOnList'),
});
}
- $this_item->{allow_onshelf_holds} = C4::Reserves::OnShelfHoldsAllowed($this_item, $borrower);
-
+ my $items = $biblio->items;
+ while ( my $item = $items->next ) {
+ $this_item->{allow_onshelf_holds} = Koha::IssuingRules->get_onshelfholds_policy( { item => $item, patron => $patron } );
+ last if $this_item->{allow_onshelf_holds};
+ }
if ( grep {$_ eq $biblionumber} @cart_list) {
$this_item->{incart} = 1;
}
- if ( $query->param('rss') ) {
- $this_item->{title} = $content->biblionumber->title;
- $this_item->{author} = $content->biblionumber->author;
- $this_item->{biblionumber} = $biblionumber;
- }
+ $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 );
$template->param(
- addbarshelves => $totalref->{bartotal},
- addbarshelvesloop => $barshelves,
- addpubshelves => $totalref->{pubtotal},
- addpubshelvesloop => $pubshelves,
can_manage_shelf => $shelf->can_be_managed($loggedinuser),
can_delete_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, }
),
);
}
} else {
push @messages, { type => 'error', code => 'unauthorized_on_view' };
+ undef $shelf;
}
} else {
push @messages, { type => 'error', code => 'does_not_exist' };
shelf => $shelf,
messages => \@messages,
category => $category,
- print => $query->param('print') || 0,
+ print => scalar $query->param('print') || 0,
listsview => 1,
);
projects / koha.git / blobdiff