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

(-)a/opac/opac-ISBDdetail.pl (-1 / +11 lines)
Lines 84-89 $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHo Link Here
84
$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
84
$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
85
85
86
my $marcflavour      = C4::Context->preference("marcflavour");
86
my $marcflavour      = C4::Context->preference("marcflavour");
87
88
my @items = GetItemsInfo($biblionumber);
89
if (scalar @items >= 1) {
90
    my @hiddenitems = GetHiddenItemnumbers(@items);
91
92
    if (scalar @hiddenitems == scalar @items ) {
93
        print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
94
        exit;
95
    }
96
}
97
87
my $record = GetMarcBiblio($biblionumber);
98
my $record = GetMarcBiblio($biblionumber);
88
if ( ! $record ) {
99
if ( ! $record ) {
89
    print $query->redirect("/cgi-bin/koha/errors/404.pl");
100
    print $query->redirect("/cgi-bin/koha/errors/404.pl");
Lines 138-144 $template->param( Link Here
138
149
139
my $norequests = 1;
150
my $norequests = 1;
140
my $res = GetISBDView($biblionumber, "opac");
151
my $res = GetISBDView($biblionumber, "opac");
141
my @items = GetItemsInfo( $biblionumber );
142
152
143
my $itemtypes = GetItemTypes();
153
my $itemtypes = GetItemTypes();
144
for my $itm (@items) {
154
for my $itm (@items) {
(-)a/opac/opac-MARCdetail.pl (+17 lines)
Lines 50-55 use C4::Output; Link Here
50
use CGI;
50
use CGI;
51
use MARC::Record;
51
use MARC::Record;
52
use C4::Biblio;
52
use C4::Biblio;
53
use C4::Items;
53
use C4::Acquisition;
54
use C4::Acquisition;
54
use C4::Koha;
55
use C4::Koha;
55
56
Lines 58-63 my $query = new CGI; Link Here
58
my $dbh = C4::Context->dbh;
59
my $dbh = C4::Context->dbh;
59
60
60
my $biblionumber = $query->param('biblionumber');
61
my $biblionumber = $query->param('biblionumber');
62
if ( ! $biblionumber ) {
63
    print $query->redirect("/cgi-bin/koha/errors/404.pl");
64
    exit;
65
}
66
67
my @all_items = GetItemsInfo($biblionumber);
68
my @items2hide;
69
if (scalar @all_items >= 1) {
70
    push @items2hide, GetHiddenItemnumbers(@all_items);
71
72
    if (scalar @items2hide == scalar @all_items ) {
73
        print $query->redirect("/cgi-bin/koha/errors/404.pl");
74
        exit;
75
    }
76
}
77
61
my $itemtype     = &GetFrameworkCode($biblionumber);
78
my $itemtype     = &GetFrameworkCode($biblionumber);
62
my $tagslib      = &GetMarcStructure( 0, $itemtype );
79
my $tagslib      = &GetMarcStructure( 0, $itemtype );
63
my $biblio = GetBiblioData($biblionumber);
80
my $biblio = GetBiblioData($biblionumber);
(-)a/opac/opac-detail.pl (-14 / +8 lines)
Lines 73-86 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
73
my $biblionumber = $query->param('biblionumber') || $query->param('bib') || 0;
73
my $biblionumber = $query->param('biblionumber') || $query->param('bib') || 0;
74
$biblionumber = int($biblionumber);
74
$biblionumber = int($biblionumber);
75
75
76
my @itemsmatchingbiblionumber = GetItemsInfo($biblionumber);
76
my @all_items = GetItemsInfo($biblionumber);
77
if (scalar @itemsmatchingbiblionumber >= 1) {
77
my @hiddenitems;
78
    my @items2hide = GetHiddenItemnumbers(@itemsmatchingbiblionumber);
78
if (scalar @all_items >= 1) {
79
79
    push @hiddenitems, GetHiddenItemnumbers(@all_items);
80
    if (scalar @items2hide == scalar @itemsmatchingbiblionumber ) {
80
81
        # biblionumber=0 effectively hides the biblio record
81
    if (scalar @hiddenitems == scalar @all_items ) {
82
        # since there is no such biblionumber.
82
        print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
83
        $biblionumber = 0;
83
        exit;
84
    }
84
    }
85
}
85
}
86
86
Lines 408-415 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) ); Link Here
408
408
409
$template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowCheckoutName") );
409
$template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowCheckoutName") );
410
$template->param('OPACShowBarcode' => C4::Context->preference("OPACShowBarcode") );
410
$template->param('OPACShowBarcode' => C4::Context->preference("OPACShowBarcode") );
411
# change back when ive fixed request.pl
412
my @all_items = GetItemsInfo( $biblionumber );
413
411
414
# adding items linked via host biblios
412
# adding items linked via host biblios
415
413
Lines 432-440 foreach my $hostfield ( $record->field($analyticfield)) { Link Here
432
430
433
my @items;
431
my @items;
434
432
435
# Getting items to be hidden
436
my @hiddenitems = GetHiddenItemnumbers(@all_items);
437
438
# Are there items to hide?
433
# Are there items to hide?
439
my $hideitems;
434
my $hideitems;
440
$hideitems = 1 if C4::Context->preference('hidelostitems') or scalar(@hiddenitems) > 0;
435
$hideitems = 1 if C4::Context->preference('hidelostitems') or scalar(@hiddenitems) > 0;
441
- 

Return to bug 10584