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

(-)a/admin/columns_settings.yml (+4 lines)
Lines 382-387 modules: Link Here
382
              columnname: holdings_holdingbranch
382
              columnname: holdings_holdingbranch
383
            -
383
            -
384
              columnname: holdings_homebranch
384
              columnname: holdings_homebranch
385
            -
386
              columnname: holdings_shelvinglocation
385
            -
387
            -
386
              columnname: holdings_ccode
388
              columnname: holdings_ccode
387
            -
389
            -
Lines 445-450 modules: Link Here
445
              columnname: otherholdings_holdingbranch
447
              columnname: otherholdings_holdingbranch
446
            -
448
            -
447
              columnname: otherholdings_homebranch
449
              columnname: otherholdings_homebranch
450
            -
451
              columnname: otherholdings_shelvinglocation
448
            -
452
            -
449
              columnname: otherholdings_ccode
453
              columnname: otherholdings_ccode
450
            -
454
            -
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref (+9 lines)
Lines 119-124 Staff interface: Link Here
119
              type: textarea
119
              type: textarea
120
              syntax: text/html
120
              syntax: text/html
121
              class: code
121
              class: code
122
        -
123
            - 'Display the shelving location '
124
            - pref: StaffLocationOnDetail
125
              choices:
126
                  home: "below the home library"
127
                  holding: "below the holding library"
128
                  both: "below both home and holding libraries"
129
                  column: "on a separate column"
130
            - 'for items on the staff interface record details page. <br/> Note: If on a separate column is selected, you still need to enable holdings_shelvinglocation on the <a href="/cgi-bin/koha/admin/columns_settings.pl">Table settings</a> adminstration page.'
122
        -
131
        -
123
            - "Show the following HTML on the staff interface login page"
132
            - "Show the following HTML on the staff interface login page"
124
            - pref: StaffLoginInstructions
133
            - pref: StaffLoginInstructions
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-17 / +39 lines)
Lines 31-36 Link Here
31
    [% END %]
31
    [% END %]
32
[% END %]
32
[% END %]
33
33
34
[% BLOCK shelvinglocation %]
35
    [%# If permanent location is defined, show description or code and             %]
36
    [%# display current location in parentheses. If not, display current location. %]
37
    [%# Note that permanent location is a code, and location may be an authval.    %]
38
        [% SET item_location = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) %]
39
        [% IF item.permanent_location %]
40
            [% SET permloc_authval = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.permanent_location ) %]
41
            [% permloc_authval | html %]
42
            [% IF item_location AND item_location != permloc_authval AND item.location != item.permanent_location %]
43
                ([% item_location | html %])
44
            [% END %]
45
        [% ELSE %]
46
            [% item_location | html %]
47
        [% END %]
48
[% END %]
49
34
[% SET plugins_intranet_catalog_biblio_tabs = KohaPlugins.get_plugins_intranet_catalog_biblio_tab({ biblio => biblio, biblio_id => biblionumber }) %]
50
[% SET plugins_intranet_catalog_biblio_tabs = KohaPlugins.get_plugins_intranet_catalog_biblio_tab({ biblio => biblio, biblio_id => biblionumber }) %]
35
51
36
[% SET footerjs = 1 %]
52
[% SET footerjs = 1 %]
Lines 356-361 Link Here
356
                [% IF ( item_level_itypes ) %]<th id="[% tab | html %]_itype" data-colname="[% tab | html %]_itype">Item type</th>[% END %]
372
                [% IF ( item_level_itypes ) %]<th id="[% tab | html %]_itype" data-colname="[% tab | html %]_itype">Item type</th>[% END %]
357
                <th id="[% tab | html %]_holdingbranch" data-colname="[% tab | html %]_holdingbranch">Current library</th>
373
                <th id="[% tab | html %]_holdingbranch" data-colname="[% tab | html %]_holdingbranch">Current library</th>
358
                <th id="[% tab | html %]_homebranch" data-colname="[% tab | html %]_homebranch">Home library</th>
374
                <th id="[% tab | html %]_homebranch" data-colname="[% tab | html %]_homebranch">Home library</th>
375
                [% IF Koha.Preference('StaffLocationOnDetail') == 'column' %]
376
                    <th id="[% tab | html %]_shelvingloction" data-colname="[% tab | html %]_shelvinglocation">Shelving location</th>
377
                [% END %]
359
                [% IF ( itemdata_ccode ) %]<th id="[% tab | html %]_ccode" data-colname="[% tab | html %]_ccode">Collection</th>[% END %]
378
                [% IF ( itemdata_ccode ) %]<th id="[% tab | html %]_ccode" data-colname="[% tab | html %]_ccode">Collection</th>[% END %]
360
                [% IF Koha.Preference('EnableItemGroups') %]
379
                [% IF Koha.Preference('EnableItemGroups') %]
361
                    <th id="[% tab | html %]_item_group" data-colname="[% tab | html %]_item_group">Item group</th>
380
                    <th id="[% tab | html %]_item_group" data-colname="[% tab | html %]_item_group">Item group</th>
Lines 420-444 Link Here
420
                            <span class="itypedesc itypetext">[% itemtype.translated_description | html %]</span>
439
                            <span class="itypedesc itypetext">[% itemtype.translated_description | html %]</span>
421
                        </td>
440
                        </td>
422
                    [% END %]
441
                    [% END %]
423
                    <td class="location">[% UNLESS ( singlebranchmode ) %][% Branches.GetName( item.holdingbranch ) | html %] [% END %]</td>
442
                    <td class="location">
443
                        [% UNLESS ( singlebranchmode ) %]
444
                            [% Branches.GetName( item.holdingbranch ) | html %]
445
                            [% IF ( Koha.Preference('StaffLocationOnDetail') == 'holding' || Koha.Preference('StaffLocationOnDetail') == 'both' ) %]
446
                            <span class="shelvingloc">
447
                                [% PROCESS shelvinglocation %]
448
                            </span>
449
                            [% END %]
450
                        [% END %]
451
                    </td>
424
                    <td class="homebranch">
452
                    <td class="homebranch">
425
                        <span class="homebranchdesc">[% Branches.GetName(item.homebranch) | html %]</span>
453
                        <span class="homebranchdesc">[% Branches.GetName(item.homebranch) | html %]</span>
426
                        <span class="shelvingloc">
454
                        [% IF ( Koha.Preference('StaffLocationOnDetail') == 'home' || Koha.Preference('StaffLocationOnDetail') == 'both' ) %]
427
                        [%# If permanent location is defined, show description or code and             %]
455
                            <span class="shelvingloc">
428
                        [%# display current location in parentheses. If not, display current location. %]
456
                                [% PROCESS shelvinglocation %]
429
                        [%# Note that permanent location is a code, and location may be an authval.    %]
457
                            </span>
430
                            [% SET item_location = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) %]
458
                        [% END %]
431
                            [% IF item.permanent_location %]
432
                                [% SET permloc_authval = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.permanent_location ) %]
433
                                [% permloc_authval | html %]
434
                                [% IF item_location AND item_location != permloc_authval AND item.location != item.permanent_location %]
435
                                    ([% item_location | html %])
436
                                [% END %]
437
                            [% ELSE %]
438
                                [% item_location | html %]
439
                            [% END %]
440
                        </span>
441
                    </td>
459
                    </td>
460
                    [% IF Koha.Preference('StaffLocationOnDetail') == 'column' %]
461
                        <td class="shelvinglocation">
462
                            [% PROCESS shelvinglocation %]
463
                        </td>
464
                    [% END %]
442
                    [% IF ( itemdata_ccode ) %]<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => item.ccode ) | html %]</td>[% END %]
465
                    [% IF ( itemdata_ccode ) %]<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => item.ccode ) | html %]</td>[% END %]
443
                    [% IF Koha.Preference('EnableItemGroups') %]<td class="item_group">[% item.object.item_group.description | html %]</td>[% END %]
466
                    [% IF Koha.Preference('EnableItemGroups') %]<td class="item_group">[% item.object.item_group.description | html %]</td>[% END %]
444
                    <td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber | html %][% END %]</td>
467
                    <td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber | html %][% END %]</td>
445
- 

Return to bug 15461