View | Details | Raw Unified | Return to bug 36858
Collapse All | Expand All

(-)a/opac/opac-shelves.pl (-5 / +5 lines)
Lines 86-93 if (C4::Context->preference("BakerTaylorEnabled")) { Link Here
86
    );
86
    );
87
}
87
}
88
88
89
my $referer  = $query->param('referer')  || $op;
89
my $referer = $query->param('referer')            || $op;
90
my $public = 0;
90
my $page    = int( $query->param('page') // q{} ) || 1;
91
my $public  = 0;
91
$public = 1 if $query->param('public') && $query->param('public') == 1;
92
$public = 1 if $query->param('public') && $query->param('public') == 1;
92
93
93
my ( $shelf, $shelfnumber, @messages );
94
my ( $shelf, $shelfnumber, @messages );
Lines 315-324 if ( $op eq 'view' ) { Link Here
315
            $direction = 'asc' if !$direction or ( $direction ne 'asc' and $direction ne 'desc' );
316
            $direction = 'asc' if !$direction or ( $direction ne 'asc' and $direction ne 'desc' );
316
            $sortfield = 'title' if !$sortfield or !grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded );
317
            $sortfield = 'title' if !$sortfield or !grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded );
317
318
318
            my ( $page, $rows );
319
            my $rows;
319
            unless ( $query->param('print') or $query->param('rss') ) {
320
            unless ( $query->param('print') or $query->param('rss') ) {
320
                $rows = C4::Context->preference('OPACnumSearchResults') || 20;
321
                $rows = C4::Context->preference('OPACnumSearchResults') || 20;
321
                $page = ( $query->param('page') ? $query->param('page') : 1 );
322
            }
322
            }
323
            my $order_by = $sortfield eq 'itemcallnumber' ? 'items.cn_sort' : $sortfield;
323
            my $order_by = $sortfield eq 'itemcallnumber' ? 'items.cn_sort' : $sortfield;
324
            my $contents = $shelf->get_contents->search(
324
            my $contents = $shelf->get_contents->search(
Lines 473-479 if ( $op eq 'view' ) { Link Here
473
    }
473
    }
474
} elsif ( $op eq 'list' ) {
474
} elsif ( $op eq 'list' ) {
475
    my $shelves;
475
    my $shelves;
476
    my ( $page, $rows ) = ( $query->param('page') || 1, 20 );
476
    my ( $rows ) = ( 20 );
477
    if ( !$public ) {
477
    if ( !$public ) {
478
        $shelves = Koha::Virtualshelves->get_private_shelves({ page => $page, rows => $rows, borrowernumber => $loggedinuser, });
478
        $shelves = Koha::Virtualshelves->get_private_shelves({ page => $page, rows => $rows, borrowernumber => $loggedinuser, });
479
    } else {
479
    } else {
(-)a/virtualshelves/shelves.pl (-6 / +5 lines)
Lines 54-62 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
54
    }
54
    }
55
);
55
);
56
56
57
my $op       = $query->param('op')      || 'list';
57
my $op      = $query->param('op')                 || 'list';
58
my $referer  = $query->param('referer') || $op;
58
my $referer = $query->param('referer')            || $op;
59
my $public   = $query->param('public') ? 1 : 0;
59
my $page    = int( $query->param('page') // q{} ) || 1;
60
my $public  = $query->param('public') ? 1 : 0;
60
my ( $shelf, $shelfnumber, @messages, $allow_transfer );
61
my ( $shelf, $shelfnumber, @messages, $allow_transfer );
61
62
62
# PART1: Perform a few actions
63
# PART1: Perform a few actions
Lines 274-283 if ( $op eq 'view' ) { Link Here
274
            $sortfield = 'title' unless grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded );
275
            $sortfield = 'title' unless grep { $_ eq $sortfield } qw( title author copyrightdate itemcallnumber dateadded );
275
            my $direction = $query->param('direction') || 'asc';
276
            my $direction = $query->param('direction') || 'asc';
276
            $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
277
            $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
277
            my ( $rows, $page );
278
            my $rows;
278
            unless ( $query->param('print') ) {
279
            unless ( $query->param('print') ) {
279
                $rows = C4::Context->preference('numSearchResults') || 20;
280
                $rows = C4::Context->preference('numSearchResults') || 20;
280
                $page = ( $query->param('page') ? $query->param('page') : 1 );
281
            }
281
            }
282
282
283
            my $order_by = $sortfield eq 'itemcallnumber' ? 'items.cn_sort' : $sortfield;
283
            my $order_by = $sortfield eq 'itemcallnumber' ? 'items.cn_sort' : $sortfield;
284
- 

Return to bug 36858