projects
/
koha_ffzg
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 22360: (bug 21205 follow-up) Restore OPACAcquisitionDetails behavior
[koha_ffzg]
/
opac
/
opac-shelves.pl
diff --git
a/opac/opac-shelves.pl
b/opac/opac-shelves.pl
index
e790b43
..
ab1a835
100755
(executable)
--- a/
opac/opac-shelves.pl
+++ b/
opac/opac-shelves.pl
@@
-29,7
+29,9
@@
use C4::Output;
use C4::Tags qw( get_tags );
use C4::XSLT;
use C4::Tags qw( get_tags );
use C4::XSLT;
+use Koha::Biblios;
use Koha::Biblioitems;
use Koha::Biblioitems;
+use Koha::IssuingRules;
use Koha::Items;
use Koha::ItemTypes;
use Koha::Patrons;
use Koha::Items;
use Koha::ItemTypes;
use Koha::Patrons;
@@
-112,7
+114,7
@@
if ( $op eq 'add_form' ) {
if ( $shelf ) {
$op = $referer;
my $sortfield = $query->param('sortfield');
if ( $shelf ) {
$op = $referer;
my $sortfield = $query->param('sortfield');
- $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber );
+ $sortfield = 'title' unless grep {/^$sortfield$/}qw( title author copyrightdate itemcallnumber
dateadded
);
if ( $shelf->can_be_managed( $loggedinuser ) ) {
$shelf->shelfname( scalar $query->param('shelfname') );
$shelf->sortfield( $sortfield );
if ( $shelf->can_be_managed( $loggedinuser ) ) {
$shelf->shelfname( scalar $query->param('shelfname') );
$shelf->sortfield( $sortfield );
@@
-174,10
+176,10
@@
if ( $op eq 'add_form' ) {
$shelf = Koha::Virtualshelves->find($shelfnumber);
if ($shelf) {
if( my $barcode = $query->param('barcode') ) {
$shelf = Koha::Virtualshelves->find($shelfnumber);
if ($shelf) {
if( my $barcode = $query->param('barcode') ) {
- my $item =
GetItem( 0, $barcode
);
- if (
defined $item && $item->{itemnumber}
) {
+ my $item =
Koha::Items->find({ barcode => $barcode }
);
+ if (
$item
) {
if ( $shelf->can_biblios_be_added( $loggedinuser ) ) {
if ( $shelf->can_biblios_be_added( $loggedinuser ) ) {
- my $added = eval { $shelf->add_biblio( $item->
{biblionumber}
, $loggedinuser ); };
+ my $added = eval { $shelf->add_biblio( $item->
biblionumber
, $loggedinuser ); };
if ($@) {
push @messages, { type => 'error', code => ref($@), msg => $@ };
} elsif ( $added ) {
if ($@) {
push @messages, { type => 'error', code => ref($@), msg => $@ };
} elsif ( $added ) {
@@
-233,7
+235,7
@@
if ( $op eq 'view' ) {
if ( $shelf->can_be_viewed( $loggedinuser ) ) {
$category = $shelf->category;
my $sortfield = $query->param('sortfield') || $shelf->sortfield; # Passed in sorting overrides default sorting
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 );
+ $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 );
my $direction = $query->param('direction') || 'asc';
$direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
my ( $page, $rows );
@@
-241,7
+243,7
@@
if ( $op eq 'view' ) {
$rows = C4::Context->preference('OPACnumSearchResults') || 20;
$page = ( $query->param('page') ? $query->param('page') : 1 );
}
$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(
{},
{
my $contents = $shelf->get_contents->search(
{},
{
@@
-270,8
+272,9
@@
if ( $op eq 'view' ) {
while ( my $content = $contents->next ) {
my $biblionumber = $content->biblionumber;
my $this_item = GetBiblioData($biblionumber);
while ( my $content = $contents->next ) {
my $biblionumber = $content->biblionumber;
my $this_item = GetBiblioData($biblionumber);
- my $record = GetMarcBiblio(
$biblionumber
);
+ my $record = GetMarcBiblio(
{ biblionumber => $biblionumber }
);
my $framework = GetFrameworkCode( $biblionumber );
my $framework = GetFrameworkCode( $biblionumber );
+ my $biblio = Koha::Biblios->find( $biblionumber );
$record_processor->options({
interface => 'opac',
frameworkcode => $framework
$record_processor->options({
interface => 'opac',
frameworkcode => $framework
@@
-315,8
+318,11
@@
if ( $op eq 'view' ) {
});
}
});
}
- $this_item->{allow_onshelf_holds} = C4::Reserves::OnShelfHoldsAllowed($this_item, $patron);
-
+ 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 ( grep {$_ eq $biblionumber} @cart_list) {
$this_item->{incart} = 1;