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

(-)a/catalogue/detail.pl (-6 / +3 lines)
Lines 516-528 $template->param( Link Here
516
# Lists
516
# Lists
517
517
518
if (C4::Context->preference("virtualshelves") ) {
518
if (C4::Context->preference("virtualshelves") ) {
519
    my $shelves = Koha::Virtualshelves->search(
519
    my $shelves = Koha::Virtualshelves->get_shelves_containing_record(
520
        {
520
        {
521
            biblionumber => $biblionumber,
521
            biblionumber   => $biblionumber,
522
            public => 1,
522
            borrowernumber => $borrowernumber
523
        },
524
        {
525
            join => 'virtualshelfcontents',
526
        }
523
        }
527
    );
524
    );
528
    $template->param( 'shelves' => $shelves );
525
    $template->param( 'shelves' => $shelves );
(-)a/catalogue/search.pl (+8 lines)
Lines 596-601 for (my $i=0;$i<@servers;$i++) { Link Here
596
                if ( grep {$_ eq $line->{'biblionumber'}} @cart_list) {
596
                if ( grep {$_ eq $line->{'biblionumber'}} @cart_list) {
597
                    $line->{'incart'} = 1;
597
                    $line->{'incart'} = 1;
598
                }
598
                }
599
600
                $line->{'shelves'} = Koha::Virtualshelves->get_shelves_containing_record(
601
                    {
602
                        biblionumber   => $line->{'biblionumber'},
603
                        borrowernumber => $borrowernumber
604
                    }
605
                );
606
599
            }
607
            }
600
            my( $page_numbers, $hits_to_paginate, $pages, $current_page_number, $previous_page_offset, $next_page_offset, $last_page_offset ) =
608
            my( $page_numbers, $hits_to_paginate, $pages, $current_page_number, $previous_page_offset, $next_page_offset, $last_page_offset ) =
601
                Koha::SearchEngine::Search->pagination_bar(
609
                Koha::SearchEngine::Search->pagination_bar(
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+5 lines)
Lines 639-644 ol { Link Here
639
    font-weight: bold;
639
    font-weight: bold;
640
}
640
}
641
641
642
.privateshelf {
643
    font-style: italic;
644
    color: #666;
645
}
646
642
.problem {
647
.problem {
643
    color: #990000;
648
    color: #990000;
644
    font-weight: bold;
649
    font-weight: bold;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (+1 lines)
Lines 122-127 Link Here
122
            <span class="results_summary"><span class="label">Lists that include this title: </span>
122
            <span class="results_summary"><span class="label">Lists that include this title: </span>
123
            [% FOREACH s IN shelves %]
123
            [% FOREACH s IN shelves %]
124
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a>
124
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a>
125
                [% UNLESS ( s.public ) %] <span class="privateshelf">Private</span> [% END %]
125
                [% IF ( loop.last ) %][% ELSE %]|[% END %]
126
                [% IF ( loop.last ) %][% ELSE %]|[% END %]
126
            [% END %]
127
            [% END %]
127
            </span>
128
            </span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (+11 lines)
Lines 498-503 Link Here
498
                                                [% SEARCH_RESULT.result_number | html %].
498
                                                [% SEARCH_RESULT.result_number | html %].
499
                                                [% SEARCH_RESULT.XSLTResultsRecord | $raw %]
499
                                                [% SEARCH_RESULT.XSLTResultsRecord | $raw %]
500
500
501
                                                [% IF Koha.Preference('virtualshelves') AND SEARCH_RESULT.shelves.count %]
502
                                                    <div class="results_summary shelves">
503
                                                        <span class="label">Lists:</span>
504
                                                        [% FOREACH shelf IN SEARCH_RESULT.shelves %]
505
                                                            <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]">[% shelf.shelfname | html %]</a>
506
                                                            [% UNLESS ( shelf.public ) %]<span class="privateshelf">Private</span>[% END %]
507
                                                            [%~ UNLESS loop.last %], [% ELSE %].[% END ~%]
508
                                                        [% END %]
509
                                                    </div>
510
                                                [% END %]
511
501
                                                <p class="hold">
512
                                                <p class="hold">
502
                                                    [% IF ( SEARCH_RESULT.norequests ) %]
513
                                                    [% IF ( SEARCH_RESULT.norequests ) %]
503
                                                        <span class="noholdstext">No holds allowed</span>
514
                                                        <span class="noholdstext">No holds allowed</span>
(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (+5 lines)
Lines 59-64 Link Here
59
    }
59
    }
60
}
60
}
61
61
62
.privateshelf {
63
    font-style: italic;
64
    color: #666;
65
}
66
62
a {
67
a {
63
    &:link,
68
    &:link,
64
    &:visited {
69
    &:visited {
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-5 / +7 lines)
Lines 193-203 Link Here
193
193
194
                    [% IF shelves.count %]
194
                    [% IF shelves.count %]
195
                        <!--This grabs all of the lists a bib record appears in -->
195
                        <!--This grabs all of the lists a bib record appears in -->
196
                        <span class="results_summary lists"><span class="label">List(s) this item appears in: </span>
196
                        <span class="results_summary lists">
197
                        [% FOREACH s IN shelves %]
197
                            <span class="label">Lists that include this title: </span>
198
                            <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a>
198
                            [% FOREACH s IN shelves %]
199
                            [% IF ( loop.last ) %][% ELSE %]|[% END %]
199
                                <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a>
200
                        [% END %]
200
                                [% UNLESS ( s.public ) %] <span class="privateshelf">Private</span> [% END %]
201
                                [% IF ( loop.last ) %][% ELSE %]|[% END %]
202
                            [% END %]
201
                        </span>
203
                        </span>
202
                    [% END %]
204
                    [% END %]
203
205
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-1 / +1 lines)
Lines 493-498 Link Here
493
                                                            [% FOREACH shelf IN SEARCH_RESULT.shelves %]
493
                                                            [% FOREACH shelf IN SEARCH_RESULT.shelves %]
494
                                                                <li>
494
                                                                <li>
495
                                                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]">[% shelf.shelfname | html %]</a>
495
                                                                    <a href="/cgi-bin/koha/opac-shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]">[% shelf.shelfname | html %]</a>
496
                                                                    [% UNLESS ( shelf.public ) %] <span class="privateshelf">Private</span> [% END %]
496
                                                                    [%~ UNLESS loop.last %], [% ELSE %].[% END ~%]
497
                                                                    [%~ UNLESS loop.last %], [% ELSE %].[% END ~%]
497
                                                                </li>
498
                                                                </li>
498
                                                            [% END %]
499
                                                            [% END %]
499
- 

Return to bug 29621