use Modern::Perl;
use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Biblio;
-use C4::Koha;
-use C4::Items;
+use C4::Auth qw( get_template_and_user );
+use C4::Biblio qw( GetBiblioData GetFrameworkCode GetMarcBiblio );
+use C4::External::BakerTaylor qw( image_url link_url );
+use C4::Koha qw(
+ GetNormalizedEAN
+ GetNormalizedISBN
+ GetNormalizedOCLCNumber
+ GetNormalizedUPC
+);
use C4::Members;
-use C4::Output;
+use C4::Output qw( pagination_bar output_with_http_headers );
use C4::Tags qw( get_tags );
-use C4::XSLT;
+use C4::XSLT qw( XSLTParse4Display );
use Koha::Biblios;
use Koha::Biblioitems;
-use Koha::IssuingRules;
+use Koha::CirculationRules;
+use Koha::CsvProfiles;
use Koha::Items;
use Koha::ItemTypes;
use Koha::Patrons;
use constant ANYONE => 2;
-my $query = new CGI;
+my $query = CGI->new;
my $template_name = $query->param('rss') ? "opac-shelves-rss.tt" : "opac-shelves.tt";
exit;
}
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
- template_name => $template_name,
- query => $query,
- type => "opac",
- authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
- });
+my $op = $query->param('op') || 'list';
+my ( $template, $loggedinuser, $cookie );
+
+if( $op eq 'view' || $op eq 'list' ){
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user({
+ template_name => $template_name,
+ query => $query,
+ type => "opac",
+ authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
+ });
+} else {
+ ( $template, $loggedinuser, $cookie ) = get_template_and_user({
+ template_name => $template_name,
+ query => $query,
+ type => "opac",
+ authnotrequired => 0,
+ });
+}
+
+if (C4::Context->preference("BakerTaylorEnabled")) {
+ $template->param(
+ BakerTaylorImageURL => &image_url(),
+ BakerTaylorLinkURL => &link_url(),
+ );
+}
-my $op = $query->param('op') || 'list';
my $referer = $query->param('referer') || $op;
-my $category = $query->param('category') || 1;
+my $public = 0;
+$public = 1 if $query->param('public') && $query->param('public') == 1;
+
my ( $shelf, $shelfnumber, @messages );
if ( $op eq 'add_form' ) {
$shelf = Koha::Virtualshelves->find($shelfnumber);
if ( $shelf ) {
- $category = $shelf->category;
+ $public = $shelf->public;
my $patron = Koha::Patrons->find( $shelf->owner );
$template->param( owner => $patron, );
unless ( $shelf->can_be_managed( $loggedinuser ) ) {
$shelf = Koha::Virtualshelf->new(
{ shelfname => scalar $query->param('shelfname'),
sortfield => scalar $query->param('sortfield'),
- category => scalar $query->param('category') || 1,
+ public => $public,
allow_change_from_owner => $allow_changes_from > 0,
allow_change_from_others => $allow_changes_from == ANYONE,
owner => scalar $loggedinuser,
if ( $shelf ) {
$op = $referer;
my $sortfield = $query->param('sortfield');
- $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber dateadded );
+ $sortfield = 'title' unless grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded );
if ( $shelf->can_be_managed( $loggedinuser ) ) {
$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') );
+ $shelf->public( $public );
eval { $shelf->store };
if ($@) {
$shelf = Koha::Virtualshelves->find($shelfnumber);
if ( $shelf ) {
if ( $shelf->can_be_viewed( $loggedinuser ) ) {
- $category = $shelf->category;
+ $public = $shelf->public;
+
+ # Sortfield param may still include sort order with :asc or :desc, but direction overrides it
my( $sortfield, $direction );
- if( defined( $query->param('sortfield') ) ){ # Passed in sorting overrides default sorting
+ if( $query->param('sortfield') ){
( $sortfield, $direction ) = split /:/, $query->param('sortfield');
} else {
$sortfield = $shelf->sortfield;
$direction = 'asc';
}
- $sortfield = 'title' unless grep $_ eq $sortfield, qw( title author copyrightdate itemcallnumber dateadded );
- $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
+ $direction = $query->param('direction') if $query->param('direction');
+ $direction = 'asc' if !$direction or ( $direction ne 'asc' and $direction ne 'desc' );
+ $sortfield = 'title' if !$sortfield or !grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded );
+
my ( $page, $rows );
unless ( $query->param('print') or $query->param('rss') ) {
$rows = C4::Context->preference('OPACnumSearchResults') || 20;
my $contents = $shelf->get_contents->search(
{},
{
- prefetch => [ { 'biblionumber' => { 'biblioitems' => 'items' } } ],
+ distinct => 'biblionumber',
+ join => [ { 'biblionumber' => { 'biblioitems' => 'items' } } ],
page => $page,
rows => $rows,
order_by => { "-$direction" => $order_by },
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;
+ my $categorycode; # needed for may_article_request
+ if( C4::Context->preference('ArticleRequests') ) {
+ $categorycode = $patron ? $patron->categorycode : undef;
+ }
my $record_processor = Koha::RecordProcessor->new({ filters => 'ViewPolicy' });
- my @items;
+
+ my $art_req_itypes;
+ if( C4::Context->preference('ArticleRequests') ) {
+ $art_req_itypes = Koha::CirculationRules->guess_article_requestable_itemtypes({ $patron ? ( categorycode => $patron->categorycode ) : () });
+ }
+
+ my @items_info;
while ( my $content = $contents->next ) {
my $biblionumber = $content->biblionumber;
my $this_item = GetBiblioData($biblionumber);
});
$record_processor->process($record);
- if ( $xslfile ) {
- $this_item->{XSLTBloc} = XSLTParse4Display( $biblionumber, $record, "OPACXSLTListsDisplay",
- 1, undef, $sysxml, $xslfile, $lang);
- }
-
my $marcflavour = C4::Context->preference("marcflavour");
my $itemtype = Koha::Biblioitems->search({ biblionumber => $content->biblionumber })->next->itemtype;
$itemtype = Koha::ItemTypes->find( $itemtype );
$this_item->{'normalized_ean'} = GetNormalizedEAN( $record, $marcflavour );
$this_item->{'normalized_oclc'} = GetNormalizedOCLCNumber( $record, $marcflavour );
$this_item->{'normalized_isbn'} = GetNormalizedISBN( undef, $record, $marcflavour );
+ # BZ17530: 'Intelligent' guess if result can be article requested
+ $this_item->{artreqpossible} = ( $art_req_itypes->{ $this_item->{itemtype} // q{} } || $art_req_itypes->{ '*' } ) ? 1 : q{};
unless ( defined $this_item->{size} ) {
$this_item->{size} = q||;
}
- # Getting items infos for location display
- 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 => $biblionumber, approved=>1, 'sort'=>'-weight',
});
}
- my $items = $biblio->items;
+ my $items = $biblio->items->filter_by_visible_in_opac({ patron => $patron });
+ my $allow_onshelf_holds;
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};
+
+ # This method must take a Koha::Items rs
+ $allow_onshelf_holds ||= Koha::CirculationRules->get_onshelfholds_policy(
+ { item => $item, patron => $patron } );
+
}
+ $this_item->{allow_onshelf_holds} = $allow_onshelf_holds;
+ $this_item->{'ITEM_RESULTS'} = $items;
+
+ my $variables = {
+ anonymous_session => ($loggedinuser) ? 0 : 1
+ };
+ $this_item->{XSLTBloc} = XSLTParse4Display(
+ {
+ biblionumber => $biblionumber,
+ record => $record,
+ xsl_syspref => "OPACXSLTListsDisplay",
+ fix_amps => 1,
+ xslt_variables => $variables,
+ items_rs => $items->reset,
+ }
+ );
+
+
if ( grep {$_ eq $biblionumber} @cart_list) {
$this_item->{incart} = 1;
}
$this_item->{biblio_object} = $biblio;
$this_item->{biblionumber} = $biblionumber;
- push @items, $this_item;
+ push @items_info, $this_item;
}
$template->param(
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),
- itemsloop => \@items,
+ itemsloop => \@items_info,
sortfield => $sortfield,
direction => $direction,
+ csv_profiles => [
+ Koha::CsvProfiles->search(
+ { type => 'marc', used_for => 'export_records', staff_only => 0 }
+ )->as_list
+ ],
);
if ( $page ) {
my $pager = $contents->pager;
if ( $op eq 'list' ) {
my $shelves;
my ( $page, $rows ) = ( $query->param('page') || 1, 20 );
- if ( $category == 1 ) {
+ if ( !$public ) {
$shelves = Koha::Virtualshelves->get_private_shelves({ page => $page, rows => $rows, borrowernumber => $loggedinuser, });
} else {
$shelves = Koha::Virtualshelves->get_public_shelves({ page => $page, rows => $rows, });
shelves => $shelves,
pagination_bar => pagination_bar(
q||, $pager->last_page - $pager->first_page + 1,
- $page, "page", { op => 'list', category => $category, }
+ $page, "page", { op => 'list', public => $public, }
),
);
}
referer => $referer,
shelf => $shelf,
messages => \@messages,
- category => $category,
+ public => $public,
print => scalar $query->param('print') || 0,
listsview => 1,
);
-output_html_with_http_headers $query, $cookie, $template->output;
+my $content_type = $query->param('rss')? 'rss' : 'html';
+output_with_http_headers $query, $cookie, $template->output, $content_type;
projects / srvgit / blobdiff