# 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::Biblioitems;
use Koha::Virtualshelves;
+use Koha::RecordProcessor;
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,
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 ) {
+ eval {
+ $shelf = Koha::Virtualshelf->new(
+ { shelfname => scalar $query->param('shelfname'),
+ sortfield => scalar $query->param('sortfield'),
+ category => scalar $query->param('category') || 1,
+ 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 $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');
} 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 {
$category = $shelf->category;
my $sortfield = $query->param('sortfield') || $shelf->sortfield; # Passed in sorting overrides default sorting
my $direction = $query->param('direction') || 'asc';
+ $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
my ( $page, $rows );
unless ( $query->param('print') or $query->param('rss') ) {
$rows = C4::Context->preference('OPACnumSearchResults') || 20;
$page = ( $query->param('page') ? $query->param('page') : 1 );
}
- my $contents = $shelf->get_contents->search({}, { join => [ 'biblionumber' ], page => $page, rows => $rows, order_by => "$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 },
+ }
+ );
# get biblionumbers stored in the cart
my @cart_list;
my $borrower = GetMember( borrowernumber => $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 $record_processor = Koha::RecordProcessor->new({ filters => 'ViewPolicy' });
my @items;
while ( my $content = $contents->next ) {
- my $this_item;
- my $biblionumber = $content->biblionumber->biblionumber;
- my $record = GetMarcBiblio($biblionumber);
+ my $biblionumber = $content->biblionumber;
+ my $this_item = GetBiblioData($biblionumber);
+ my $record = GetMarcBiblio($biblionumber);
+ my $framework = GetFrameworkCode( $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");
- my $itemtypeinfo = getitemtypeinfo( $content->biblionumber->biblioitems->first->itemtype, 'intranet' );
+ my $itemtype = Koha::Biblioitems->search({ biblionumber => $content->biblionumber })->next->itemtype;
+ my $itemtypeinfo = getitemtypeinfo( $itemtype, 'opac' );
$this_item->{imageurl} = $itemtypeinfo->{imageurl};
$this_item->{description} = $itemtypeinfo->{description};
$this_item->{notforloan} = $itemtypeinfo->{notforloan};
}
} 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