# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
+
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Biblio;
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 ( $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' };
}
} elsif ( $op eq 'add' ) {
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_add => scalar $query->param('allow_add'),
- allow_delete_own => scalar $query->param('allow_delete_own'),
- allow_delete_other => scalar $query->param('allow_delete_other'),
+ allow_change_from_owner => $allow_changes_from > 0,
+ allow_change_from_others => $allow_changes_from == ANYONE,
owner => scalar $loggedinuser,
}
);
$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 ) {
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';
$direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
my ( $page, $rows );
$rows = C4::Context->preference('OPACnumSearchResults') || 20;
$page = ( $query->param('page') ? $query->param('page') : 1 );
}
- my $order_by = $sortfield eq 'itemcallnumber' ? 'items.itemcallnumber' : $sortfield;
+ my $order_by = $sortfield eq 'itemcallnumber' ? 'items.cn_sort' : $sortfield;
my $contents = $shelf->get_contents->search(
{},
{
@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') ||
- C4::Context->preference('OPACXSLTResultsDisplay');
+ 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 $biblionumber = $content->biblionumber->biblionumber;
+ my $biblionumber = $content->biblionumber;
my $this_item = GetBiblioData($biblionumber);
- my $record = GetMarcBiblio($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 ( $xslfile ) {
$this_item->{XSLTBloc} = XSLTParse4Display( $biblionumber, $record, "OPACXSLTListsDisplay",
}
my $marcflavour = C4::Context->preference("marcflavour");
- my $itemtypeinfo = getitemtypeinfo( $content->biblionumber->biblioitems->first->itemtype, 'opac' );
- $this_item->{imageurl} = $itemtypeinfo->{imageurl};
- $this_item->{description} = $itemtypeinfo->{description};
- $this_item->{notforloan} = $itemtypeinfo->{notforloan};
+ 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( $biblionumber ) );
$this_item->{'normalized_upc'} = GetNormalizedUPC( $record, $marcflavour );
});
}
- $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;
push @items, $this_item;
}
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,
sortfield => $sortfield,
direction => $direction,
}
} else {
push @messages, { type => 'error', code => 'unauthorized_on_view' };
+ undef $shelf;
}
} else {
push @messages, { type => 'error', code => 'does_not_exist' };
projects / koha.git / blobdiff