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

(-)a/catalogue/detail.pl (-1 / +8 lines)
Lines 199-205 if ($currentbranch and C4::Context->preference('SeparateHoldings')) { Link Here
199
my $separatebranch = C4::Context->preference('SeparateHoldingsBranch') || 'homebranch';
199
my $separatebranch = C4::Context->preference('SeparateHoldingsBranch') || 'homebranch';
200
foreach my $item (@items) {
200
foreach my $item (@items) {
201
    my $itembranchcode = $item->{$separatebranch};
201
    my $itembranchcode = $item->{$separatebranch};
202
    $item->{homebranch}        = GetBranchName($item->{homebranch});
203
202
204
    # can place holds defaults to yes
203
    # can place holds defaults to yes
205
    $norequests = 0 unless ( ( $item->{'notforloan'} > 0 ) || ( $item->{'itemnotforloan'} > 0 ) );
204
    $norequests = 0 unless ( ( $item->{'notforloan'} > 0 ) || ( $item->{'itemnotforloan'} > 0 ) );
Lines 279-284 foreach my $item (@items) { Link Here
279
        $item->{'course_reserves'} = GetItemCourseReservesInfo( itemnumber => $item->{'itemnumber'} );
278
        $item->{'course_reserves'} = GetItemCourseReservesInfo( itemnumber => $item->{'itemnumber'} );
280
    }
279
    }
281
280
281
    if ( C4::Context->preference('IndependentBranches') ) {
282
        my $userenv = C4::Context->userenv();
283
        if ( not C4::Context->IsSuperLibrarian()
284
            and $userenv->{branch} ne $item->{homebranch} ) {
285
            $item->{cannot_be_edited} = 1;
286
        }
287
    }
288
282
    if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET"
289
    if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET"
283
    and C4::Context->preference('SeparateHoldings')) {
290
    and C4::Context->preference('SeparateHoldings')) {
284
        if ($itembranchcode and $itembranchcode eq $currentbranch) {
291
        if ($itembranchcode and $itembranchcode eq $currentbranch) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-3 / +5 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% USE AuthorisedValues %]
3
[% USE AuthorisedValues %]
4
[% USE Branches %]
4
5
5
[% ShowCourseReserves = 0 %]
6
[% ShowCourseReserves = 0 %]
6
[% IF UseCourseReserves %]
7
[% IF UseCourseReserves %]
Lines 624-630 function verify_images() { Link Here
624
                        </td>
625
                        </td>
625
                    [% END %]
626
                    [% END %]
626
                    <td class="location">[% UNLESS ( singlebranchmode ) %][% item.branchname %] [% END %]</td>
627
                    <td class="location">[% UNLESS ( singlebranchmode ) %][% item.branchname %] [% END %]</td>
627
                    <td class="homebranch">[% item.homebranch %]<span class="shelvingloc">[% item.location %]</span> </td>
628
                    <td class="homebranch">[% Branches.GetName(item.homebranch) %]<span class="shelvingloc">[% item.location %]</span> </td>
628
                    [% IF ( itemdata_ccode ) %]<td>[% item.ccode %]</td>[% END %]
629
                    [% IF ( itemdata_ccode ) %]<td>[% item.ccode %]</td>[% END %]
629
                    <td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber %][% END %]</td>
630
                    <td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber %][% END %]</td>
630
                    <td class="status">
631
                    <td class="status">
Lines 806-813 function verify_images() { Link Here
806
                       [% END %]
807
                       [% END %]
807
                    </td>
808
                    </td>
808
                [% END %]
809
                [% END %]
809
                [% IF ( CAN_user_editcatalogue_edit_items ) %]
810
                [% IF CAN_user_editcatalogue_edit_items and not item.cannot_be_edited %]
810
                    <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]#edititem">Edit</a></td>
811
                    <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]#edititem">Edit</a></td>
812
                [% ELSE %]
813
                    <td></td>
811
                [% END %]
814
                [% END %]
812
                </tr>
815
                </tr>
813
            [% END %]
816
            [% END %]
814
- 

Return to bug 14354