Attachment #165805 for bug #15461

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

Lines 384-389 modules: Link Here

(-)a/admin/columns_settings.yml (+4 lines)
384	columnname: holdings_holdingbranch	384	columnname: holdings_holdingbranch
385	-	385	-
386	columnname: holdings_homebranch	386	columnname: holdings_homebranch
		387	-
		388	columnname: holdings_shelvinglocation
387	-	389	-
388	columnname: holdings_ccode	390	columnname: holdings_ccode
389	-	391	-
Lines 450-455 modules: Link Here
450	columnname: otherholdings_holdingbranch	452	columnname: otherholdings_holdingbranch
451	-	453	-
452	columnname: otherholdings_homebranch	454	columnname: otherholdings_homebranch
		455	-
		456	columnname: otherholdings_shelvinglocation
453	-	457	-
454	columnname: otherholdings_ccode	458	columnname: otherholdings_ccode
455	-	459	-




use Modern::Perl;

return {
    bug_number  => "15461",
    description => "Add system preference StaffLocationOnDetail",
    up          => sub {
        my ($args) = @_;
        my ( $dbh, $out ) = @$args{qw(dbh out)};

        # Do you stuffs here
        $dbh->do(q{
            INSERT IGNORE INTO systempreferences (`variable`,`value`,`options`,`explanation`,`type`)
            VALUES ('StaffLocationOnDetail','home','holding|home|both|column','In the staff interface, display the shelving location on its own column or under a library columns.','Choice')
        });

        say $out "Added new system preference 'StaffLocationOnDetail'";
    },
};

Lines 730-735 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (+1 lines)
730	('StaffDetailItemSelection', '1', NULL, 'Enable item selection in record detail page', 'YesNo'),	730	('StaffDetailItemSelection', '1', NULL, 'Enable item selection in record detail page', 'YesNo'),
731	('StaffHighlightedWords','1','','Highlight search terms on staff interface','YesNo'),	731	('StaffHighlightedWords','1','','Highlight search terms on staff interface','YesNo'),
732	('StaffLangSelectorMode','footer','top\|both\|footer','Select the location to display the language selector in staff interface','Choice'),	732	('StaffLangSelectorMode','footer','top\|both\|footer','Select the location to display the language selector in staff interface','Choice'),
		733	('StaffLocationOnDetail','home','holding\|home\|both\|column','In the staff interface detail, display the shelving location on its own column or under a library columns.', 'Choice'),
733	('StaffLoginInstructions', '', NULL, 'HTML to go into the login box for the staff interface','Free'),	734	('StaffLoginInstructions', '', NULL, 'HTML to go into the login box for the staff interface','Free'),
734	('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch\|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),	735	('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch\|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),
735	('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the staff interface','Integer'),	736	('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the staff interface','Integer'),

Lines 16-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc (-12 / +39 lines)
16	[% IF ( item_level_itypes ) %]<th id="[% tab \| html %]_itype" data-colname="[% tab \| html %]_itype">Item type</th>[% END %]	16	[% IF ( item_level_itypes ) %]<th id="[% tab \| html %]_itype" data-colname="[% tab \| html %]_itype">Item type</th>[% END %]
17	<th id="[% tab \| html %]_holdingbranch" data-colname="[% tab \| html %]_holdingbranch">Current library</th>	17	<th id="[% tab \| html %]_holdingbranch" data-colname="[% tab \| html %]_holdingbranch">Current library</th>
18	<th id="[% tab \| html %]_homebranch" data-colname="[% tab \| html %]_homebranch">Home library</th>	18	<th id="[% tab \| html %]_homebranch" data-colname="[% tab \| html %]_homebranch">Home library</th>
		19	[% IF Koha.Preference('StaffLocationOnDetail') == 'column' %]
		20	<th id="[% tab \| html %]_shelvingloction" data-colname="[% tab \| html %]_shelvinglocation">Shelving location</th>
		21	[% END %]
19	<th id="[% tab \| html %]_ccode" data-colname="[% tab \| html %]_ccode">Collection</th>	22	<th id="[% tab \| html %]_ccode" data-colname="[% tab \| html %]_ccode">Collection</th>
20	[% IF Koha.Preference('EnableItemGroups') %]	23	[% IF Koha.Preference('EnableItemGroups') %]
21	<th id="[% tab \| html %]_item_group" data-colname="[% tab \| html %]_item_group">Item group</th>	24	<th id="[% tab \| html %]_item_group" data-colname="[% tab \| html %]_item_group">Item group</th>
Lines 363-369 Link Here
363	searchable: true,	366	searchable: true,
364	orderable: true,	367	orderable: true,
365	render: function (data, type, row, meta) {	368	render: function (data, type, row, meta) {
366	return escape_str(row._strings.holding_library_id.str);	369	let nodes = '<span class="holdingbranchdesc">%s</span>'.format(escape_str(row._strings.holding_library_id.str));
		370	[% IF ( Koha.Preference('StaffLocationOnDetail') == 'home' \|\| Koha.Preference('StaffLocationOnDetail') == 'both' ) %]
		371	nodes += '<span class="shelvingloc">'
		372	[%# If permanent location is defined, show description or code and %]
		373	[%# display current location in parentheses. If not, display current location. %]
		374	[%# Note that permanent location is a code, and location may be an authval. %]
		375	let loc_str = row._strings.location.str;
		376	if ( row.permanent_location && row.permanent_location != row.location ) {
		377	let permanent_loc_str = av_loc.get(row.permanent_location);
		378	nodes += '%s (%s)'.format(escape_str(permanent_loc_str), escape_str(loc_str));
		379	} else {
		380	nodes += escape_str(loc_str);
		381	}
		382	[% END %]
		383	nodes += '</span>';
		384	return nodes;
367	}	385	}
368	},	386	},
369	{	387	{
Lines 373-393 Link Here
373	orderable: true,	391	orderable: true,
374	render: function (data, type, row, meta) {	392	render: function (data, type, row, meta) {
375	let nodes = '<span class="homebranchdesc">%s</span>'.format(escape_str(row._strings.home_library_id.str));	393	let nodes = '<span class="homebranchdesc">%s</span>'.format(escape_str(row._strings.home_library_id.str));
376	nodes += '<span class="shelvingloc">'	394	[% IF ( Koha.Preference('StaffLocationOnDetail') == 'home' \|\| Koha.Preference('StaffLocationOnDetail') == 'both' ) %]
377	[%# If permanent location is defined, show description or code and %]	395	nodes += '<span class="shelvingloc">'
378	[%# display current location in parentheses. If not, display current location. %]	396	let loc_str = row._strings.location.str;
379	[%# Note that permanent location is a code, and location may be an authval. %]	397	if ( row.permanent_location && row.permanent_location != row.location ) {
380	let loc_str = row._strings.location.str;	398	let permanent_loc_str = av_loc.get(row.permanent_location);
381	if ( row.permanent_location && row.permanent_location != row.location ) {	399	nodes += '%s (%s)'.format(escape_str(permanent_loc_str), escape_str(loc_str));
382	let permanent_loc_str = av_loc.get(row.permanent_location);	400	} else {
383	nodes += '%s (%s)'.format(escape_str(permanent_loc_str), escape_str(loc_str));	401	nodes += escape_str(loc_str);
384	} else {	402	}
385	nodes += escape_str(loc_str);	403	[% END %]
386	}
387	nodes += '</span>';	404	nodes += '</span>';
388	return nodes;	405	return nodes;
389	}	406	}
390	},	407	},
		408	[% IF Koha.Preference('StaffLocationOnDetail') == 'column' %]
		409	{
		410	data: "me.location",
		411	searchable: true,
		412	orderable: true,
		413	render: function (data, type, row, meta) {
		414	return escape_str(row._strings.collection_code.str);
		415	}
		416	},
		417	[% END %]
391	{	418	{
392	data: "me.collection_code",	419	data: "me.collection_code",
393	searchable: true,	420	searchable: true,




              type: textarea
              syntax: text/html
              class: code
        -
            - 'Display the shelving location '
            - pref: StaffLocationOnDetail
              choices:
                  home: "below the home library"
                  holding: "below the holding library"
                  both: "below both home and holding libraries"
                  column: "on a separate column"
            - 'for items on the staff interface record details page. <br/> Note: If on a separate column is selected, you still need to enable holdings_shelving location on the <a href="/cgi-bin/koha/admin/columns_settings.pl">Table settings</a> adminstration page.'
        -
            - pref: StaffHighlightedWords
              type: boolean
- 

Return to bug 15461

Lines 125-130 Staff interface: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref (-1 / +9 lines)
125	type: textarea	125	type: textarea
126	syntax: text/html	126	syntax: text/html
127	class: code	127	class: code
		128	-
		129	- 'Display the shelving location '
		130	- pref: StaffLocationOnDetail
		131	choices:
		132	home: "below the home library"
		133	holding: "below the holding library"
		134	both: "below both home and holding libraries"
		135	column: "on a separate column"
		136	- 'for items on the staff interface record details page. <br/> Note: If on a separate column is selected, you still need to enable holdings_shelving location on the <a href="/cgi-bin/koha/admin/columns_settings.pl">Table settings</a> adminstration page.'
128	-	137	-
129	- pref: StaffHighlightedWords	138	- pref: StaffHighlightedWords
130	type: boolean	139	type: boolean
131	-

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_15461.pl (+18 lines)
	1	use Modern::Perl;
	2
	3	return {
	4	bug_number => "15461",
	5	description => "Add system preference StaffLocationOnDetail",
	6	up => sub {
	7	my ($args) = @_;
	8	my ( $dbh, $out ) = @$args{qw(dbh out)};
	9
	10	# Do you stuffs here
	11	$dbh->do(q{
	12	INSERT IGNORE INTO systempreferences (`variable`,`value`,`options`,`explanation`,`type`)
	13	VALUES ('StaffLocationOnDetail','home','holding\|home\|both\|column','In the staff interface, display the shelving location on its own column or under a library columns.','Choice')
	14	});
	15
	16	say $out "Added new system preference 'StaffLocationOnDetail'";
	17	},
	18	};