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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+16 lines)
Lines 198-203 Link Here
198
                                                    <th>Barcode</th>
198
                                                    <th>Barcode</th>
199
                                                [% END %]
199
                                                [% END %]
200
                                                    <th>Call no.</th>
200
                                                    <th>Call no.</th>
201
                                                [% IF ( show_library ) %]
202
                                                    <th>Library</th>
203
                                                [% END %]
201
                                                [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
204
                                                [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
202
                                                    <th class="nosort">Renew</th>
205
                                                    <th class="nosort">Renew</th>
203
                                                [% END %]
206
                                                [% END %]
Lines 293-298 Link Here
293
                                                    <span class="tdlabel">Call no.:</span>
296
                                                    <span class="tdlabel">Call no.:</span>
294
                                                    [% ISSUE.itemcallnumber | html %]
297
                                                    [% ISSUE.itemcallnumber | html %]
295
                                                </td>
298
                                                </td>
299
                                                [% IF ( show_library ) %]
300
                                                    <td class="library">
301
                                                        <span class="tdlabel">Library:</span>
302
                                                        [% ISSUE.library | html %]
303
                                                    </td>
304
                                                [% END %]
296
                                                [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
305
                                                [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
297
                                                    <td class="renew">
306
                                                    <td class="renew">
298
                                                    [% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
307
                                                    [% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
Lines 498-503 Link Here
498
                                            [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
507
                                            [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
499
                                            [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
508
                                            [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
500
                                            <th>Call no.</th>
509
                                            <th>Call no.</th>
510
                                            [% IF ( show_library ) %]<th>Library</th>[% END %]
501
                                            <th class="title-string psort">Due</th>
511
                                            <th class="title-string psort">Due</th>
502
                                            [% IF ( OpacRenewalAllowed ) %]
512
                                            [% IF ( OpacRenewalAllowed ) %]
503
                                                <th class="nosort">Renew</th>
513
                                                <th class="nosort">Renew</th>
Lines 568-573 Link Here
568
                                                    <span class="tdlabel">Call no.:</span>
578
                                                    <span class="tdlabel">Call no.:</span>
569
                                                    [% OVERDUE.itemcallnumber | html %]
579
                                                    [% OVERDUE.itemcallnumber | html %]
570
                                                </td>
580
                                                </td>
581
                                                [% IF ( show_library ) %]
582
                                                    <td>
583
                                                        <span class="tdlabel">Library:</span>
584
                                                        [% OVERDUE.library | html %]
585
                                                    </td>
586
                                                [% END %]
571
                                                <td>
587
                                                <td>
572
                                                    <span title="[% OVERDUE.date_due | html %]">
588
                                                    <span title="[% OVERDUE.date_due | html %]">
573
                                                        <span class="tdlabel">Date due:</span>
589
                                                        <span class="tdlabel">Date due:</span>
(-)a/opac/opac-user.pl (-1 / +12 lines)
Lines 46-51 use Koha::Patron::Discharge; Link Here
46
use Koha::Patrons;
46
use Koha::Patrons;
47
47
48
use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
48
use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
49
use constant ATTRIBUTE_SHOW_LIBRARY => 'SHOW_LIB';
49
50
50
use Scalar::Util qw(looks_like_number);
51
use Scalar::Util qw(looks_like_number);
51
use Date::Calc qw(
52
use Date::Calc qw(
Lines 255-260 if ( $pending_checkouts->count ) { # Useless test Link Here
255
        }
256
        }
256
257
257
        $issue->{biblio_object} = Koha::Biblios->find($issue->{biblionumber});
258
        $issue->{biblio_object} = Koha::Biblios->find($issue->{biblionumber});
259
        my $item = Koha::Items->find($issue->{'itemnumber'});
260
        my $library = Koha::Libraries->find($item->holdingbranch);
261
        $issue->{'library'} = $library->branchname;
258
        push @issuedat, $issue;
262
        push @issuedat, $issue;
259
        $count++;
263
        $count++;
260
264
Lines 296-301 if ($show_barcode) { Link Here
296
}
300
}
297
$template->param( show_barcode => 1 ) if $show_barcode;
301
$template->param( show_barcode => 1 ) if $show_barcode;
298
302
303
my $show_library = Koha::Patron::Attribute::Types->search(
304
    { code => ATTRIBUTE_SHOW_LIBRARY } )->count;
305
if ($show_library) {
306
    my $patron_show_library = GetBorrowerAttributeValue($borrowernumber, ATTRIBUTE_SHOW_LIBRARY);
307
    undef $show_library if defined($patron_show_library) && !$patron_show_library;
308
}
309
$template->param( show_library => 1 ) if $show_library;
310
299
# now the reserved items....
311
# now the reserved items....
300
my $reserves = Koha::Holds->search( { borrowernumber => $borrowernumber } );
312
my $reserves = Koha::Holds->search( { borrowernumber => $borrowernumber } );
301
313
302
- 

Return to bug 24364