Attachment #162991 for bug #15461

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

Lines 382-387 modules: Link Here

(-)a/admin/columns_settings.yml (+4 lines)
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	-

Lines 119-124 Staff interface: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref (+9 lines)
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




    [% END %]
[% END %]

[% BLOCK shelvinglocation %]
    [%# If permanent location is defined, show description or code and             %]
    [%# display current location in parentheses. If not, display current location. %]
    [%# Note that permanent location is a code, and location may be an authval.    %]
        [% SET item_location = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) %]
        [% IF item.permanent_location %]
            [% SET permloc_authval = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.permanent_location ) %]
            [% permloc_authval | html %]
            [% IF item_location AND item_location != permloc_authval AND item.location != item.permanent_location %]
                ([% item_location | html %])
            [% END %]
        [% ELSE %]
            [% item_location | html %]
        [% END %]
[% END %]

[% SET plugins_intranet_catalog_biblio_tabs = KohaPlugins.get_plugins_intranet_catalog_biblio_tab({ biblio => biblio, biblio_id => biblionumber }) %]

[% SET footerjs = 1 %]

                [% IF ( item_level_itypes ) %]<th id="[% tab | html %]_itype" data-colname="[% tab | html %]_itype">Item type</th>[% END %]
                <th id="[% tab | html %]_holdingbranch" data-colname="[% tab | html %]_holdingbranch">Current library</th>
                <th id="[% tab | html %]_homebranch" data-colname="[% tab | html %]_homebranch">Home library</th>
                [% IF Koha.Preference('StaffLocationOnDetail') == 'column' %]
                    <th id="[% tab | html %]_shelvingloction" data-colname="[% tab | html %]_shelvinglocation">Shelving location</th>
                [% END %]
                [% IF ( itemdata_ccode ) %]<th id="[% tab | html %]_ccode" data-colname="[% tab | html %]_ccode">Collection</th>[% END %]
                [% IF Koha.Preference('EnableItemGroups') %]
                    <th id="[% tab | html %]_item_group" data-colname="[% tab | html %]_item_group">Item group</th>

                            <span class="itypedesc itypetext">[% itemtype.translated_description | html %]</span>
                        </td>
                    [% END %]
                    <td class="location">
                        [% UNLESS ( singlebranchmode ) %]
                            [% Branches.GetName( item.holdingbranch ) | html %]
                            [% IF ( Koha.Preference('StaffLocationOnDetail') == 'holding' || Koha.Preference('StaffLocationOnDetail') == 'both' ) %]
                            <span class="shelvingloc">
                                [% PROCESS shelvinglocation %]
                            </span>
                            [% END %]
                        [% END %]
                    </td>
                    <td class="homebranch">
                        <span class="homebranchdesc">[% Branches.GetName(item.homebranch) | html %]</span>
                        [% IF ( Koha.Preference('StaffLocationOnDetail') == 'home' || Koha.Preference('StaffLocationOnDetail') == 'both' ) %]
                            <span class="shelvingloc">
                                [% PROCESS shelvinglocation %]
                            </span>
                        [% END %]
                            [% IF item.permanent_location %]
                                [% SET permloc_authval = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.permanent_location ) %]
                                [% permloc_authval | html %]
                                [% IF item_location AND item_location != permloc_authval AND item.location != item.permanent_location %]
                                    ([% item_location | html %])
                                [% END %]
                            [% ELSE %]
                                [% item_location | html %]
                            [% END %]
                        </span>
                    </td>
                    [% IF Koha.Preference('StaffLocationOnDetail') == 'column' %]
                        <td class="shelvinglocation">
                            [% PROCESS shelvinglocation %]
                        </td>
                    [% END %]
                    [% IF ( itemdata_ccode ) %]<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => item.ccode ) | html %]</td>[% END %]
                    [% IF Koha.Preference('EnableItemGroups') %]<td class="item_group">[% item.object.item_group.description | html %]</td>[% END %]
                    <td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber | html %][% END %]</td>
- 

Return to bug 15461

Lines 31-36 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-17 / +39 lines)
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 355-360 Link Here
355	[% IF ( item_level_itypes ) %]<th id="[% tab \| html %]_itype" data-colname="[% tab \| html %]_itype">Item type</th>[% END %]	371	[% IF ( item_level_itypes ) %]<th id="[% tab \| html %]_itype" data-colname="[% tab \| html %]_itype">Item type</th>[% END %]
356	<th id="[% tab \| html %]_holdingbranch" data-colname="[% tab \| html %]_holdingbranch">Current library</th>	372	<th id="[% tab \| html %]_holdingbranch" data-colname="[% tab \| html %]_holdingbranch">Current library</th>
357	<th id="[% tab \| html %]_homebranch" data-colname="[% tab \| html %]_homebranch">Home library</th>	373	<th id="[% tab \| html %]_homebranch" data-colname="[% tab \| html %]_homebranch">Home library</th>
		374	[% IF Koha.Preference('StaffLocationOnDetail') == 'column' %]
		375	<th id="[% tab \| html %]_shelvingloction" data-colname="[% tab \| html %]_shelvinglocation">Shelving location</th>
		376	[% END %]
358	[% IF ( itemdata_ccode ) %]<th id="[% tab \| html %]_ccode" data-colname="[% tab \| html %]_ccode">Collection</th>[% END %]	377	[% IF ( itemdata_ccode ) %]<th id="[% tab \| html %]_ccode" data-colname="[% tab \| html %]_ccode">Collection</th>[% END %]
359	[% IF Koha.Preference('EnableItemGroups') %]	378	[% IF Koha.Preference('EnableItemGroups') %]
360	<th id="[% tab \| html %]_item_group" data-colname="[% tab \| html %]_item_group">Item group</th>	379	<th id="[% tab \| html %]_item_group" data-colname="[% tab \| html %]_item_group">Item group</th>
Lines 419-443 Link Here
419	<span class="itypedesc itypetext">[% itemtype.translated_description \| html %]</span>	438	<span class="itypedesc itypetext">[% itemtype.translated_description \| html %]</span>
420	</td>	439	</td>
421	[% END %]	440	[% END %]
422	<td class="location">[% UNLESS ( singlebranchmode ) %][% Branches.GetName( item.holdingbranch ) \| html %] [% END %]</td>	441	<td class="location">
		442	[% UNLESS ( singlebranchmode ) %]
		443	[% Branches.GetName( item.holdingbranch ) \| html %]
		444	[% IF ( Koha.Preference('StaffLocationOnDetail') == 'holding' \|\| Koha.Preference('StaffLocationOnDetail') == 'both' ) %]
		445	<span class="shelvingloc">
		446	[% PROCESS shelvinglocation %]
		447	</span>
		448	[% END %]
		449	[% END %]
		450	</td>
423	<td class="homebranch">	451	<td class="homebranch">
424	<span class="homebranchdesc">[% Branches.GetName(item.homebranch) \| html %]</span>	452	<span class="homebranchdesc">[% Branches.GetName(item.homebranch) \| html %]</span>
425	<span class="shelvingloc">	453	[% IF ( Koha.Preference('StaffLocationOnDetail') == 'home' \|\| Koha.Preference('StaffLocationOnDetail') == 'both' ) %]
426	[%# If permanent location is defined, show description or code and %]	454	<span class="shelvingloc">
427	[%# display current location in parentheses. If not, display current location. %]	455	[% PROCESS shelvinglocation %]
428	[%# Note that permanent location is a code, and location may be an authval. %]	456	</span>
429	[% SET item_location = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) %]	457	[% END %]
430	[% IF item.permanent_location %]
431	[% SET permloc_authval = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.permanent_location ) %]
432	[% permloc_authval \| html %]
433	[% IF item_location AND item_location != permloc_authval AND item.location != item.permanent_location %]
434	([% item_location \| html %])
435	[% END %]
436	[% ELSE %]
437	[% item_location \| html %]
438	[% END %]
439	</span>
440	</td>	458	</td>
		459	[% IF Koha.Preference('StaffLocationOnDetail') == 'column' %]
		460	<td class="shelvinglocation">
		461	[% PROCESS shelvinglocation %]
		462	</td>
		463	[% END %]
441	[% IF ( itemdata_ccode ) %]<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => item.ccode ) \| html %]</td>[% END %]	464	[% IF ( itemdata_ccode ) %]<td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => item.ccode ) \| html %]</td>[% END %]
442	[% IF Koha.Preference('EnableItemGroups') %]<td class="item_group">[% item.object.item_group.description \| html %]</td>[% END %]	465	[% IF Koha.Preference('EnableItemGroups') %]<td class="item_group">[% item.object.item_group.description \| html %]</td>[% END %]
443	<td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber \| html %][% END %]</td>	466	<td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber \| html %][% END %]</td>
444	-