Attachment #134176 for bug #29129

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

Lines 153-162 my $searchtype = $query->param('searchtype') \|\| q{contain}; Link Here

(-)a/circ/circulation.pl (-4 lines)
153		153
154	my $branch = C4::Context->userenv->{'branch'};	154	my $branch = C4::Context->userenv->{'branch'};
155		155
156	if (C4::Context->preference("DisplayClearScreenButton")) {
157	$template->param(DisplayClearScreenButton => 1);
158	}
159
160	for my $barcode ( @$barcodes ) {	156	for my $barcode ( @$barcodes ) {
161	$barcode =~ s/^\s\|\s$//g; # remove leading/trailing whitespace	157	$barcode =~ s/^\s\|\s$//g; # remove leading/trailing whitespace
162	$barcode = barcodedecode( $barcode ) if $barcode;	158	$barcode = barcodedecode( $barcode ) if $barcode;




use Modern::Perl;

return {
    bug_number => "29129",
    description => "Update the DisplayClearnScreenButton system pref to allow for a choice between ISSUESLIP and ISSUEQSLIP",
    up => sub {
        my ($args) = @_;
        my ($dbh, $out) = @$args{qw(dbh out)};
        # Do you stuffs here
        $dbh->do(q{
                    UPDATE systempreferences SET options = 'no|issueslip|issueqslip', type = 'Choice', value = REPLACE( value, 0, 'no'), value =  REPLACE( value, 1, 'issueslip') WHERE variable = 'DisplayClearScreenButton';
                });
        # Print useful stuff here
        say $out "Database updated for Bug 29129";
    },
};

Lines 178-184 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +1 lines)
178	('DefaultToLoggedInLibraryOverdueTriggers', '0', NULL , 'If enabled, overdue status triggers editor will default to the logged in library''s rules, rather than the ''default'' rules.', 'YesNo'),	178	('DefaultToLoggedInLibraryOverdueTriggers', '0', NULL , 'If enabled, overdue status triggers editor will default to the logged in library''s rules, rather than the ''default'' rules.', 'YesNo'),
179	('CSVDelimiter',';',';\|tabulation\|,\|/\|\\\|#\|\|','Define the default separator character for exporting reports','Choice'),	179	('CSVDelimiter',';',';\|tabulation\|,\|/\|\\\|#\|\|','Define the default separator character for exporting reports','Choice'),
180	('Display856uAsImage','OFF','OFF\|Details\|Results\|Both','Display the URI in the 856u field as an image, the corresponding staff interface XSLT option must be on','Choice'),	180	('Display856uAsImage','OFF','OFF\|Details\|Results\|Both','Display the URI in the 856u field as an image, the corresponding staff interface XSLT option must be on','Choice'),
181	('DisplayClearScreenButton','0','','If set to ON, a clear screen button will appear on the circulation page.','YesNo'),	181	('DisplayClearScreenButton','no','no\|issueslip\|issueqslip','If set to ON, a clear screen button will appear on the circulation page.','Choice'),
182	('displayFacetCount','0',NULL,NULL,'YesNo'),	182	('displayFacetCount','0',NULL,NULL,'YesNo'),
183	('DisplayIconsXSLT','1','','If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages.','YesNo'),	183	('DisplayIconsXSLT','1','','If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages.','YesNo'),
184	('DisplayLibraryFacets', 'holding', 'home\|holding\|both', 'Defines which library facets to display.', 'Choice'),	184	('DisplayLibraryFacets', 'holding', 'home\|holding\|both', 'Defines which library facets to display.', 'Choice'),

Lines 2677-2683 td { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-1 / +2 lines)
2677	}	2677	}
2678	}	2678	}
2679		2679
2680	#printclearscreen {	2680	#printclearscreen,
		2681	#printclearscreenq {
2681	position: absolute;	2682	position: absolute;
2682	right: 43px;	2683	right: 43px;
2683	top: 0;	2684	top: 0;

Lines 106-113 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-2 / +3 lines)
106	-	106	-
107	- pref: DisplayClearScreenButton	107	- pref: DisplayClearScreenButton
108	choices:	108	choices:
109	1: Show	109	no: "Don't show"
110	0: "Don't show"	110	issueslip: "Show and print ISSUESLIP"
		111	issueqslip: "Show and print ISSUEQSLIP"
111	- a button to clear the current patron from the screen on the circulation screen.	112	- a button to clear the current patron from the screen on the circulation screen.
112	-	113	-
113	- pref: RecordLocalUseOnReturn	114	- pref: RecordLocalUseOnReturn

Lines 619-627 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +4 lines)
619	<fieldset id="circ_circulation_issue">	619	<fieldset id="circ_circulation_issue">
620	[% END %]	620	[% END %]
621		621
622	[% IF ( DisplayClearScreenButton ) %]	622	[% IF Koha.Preference('DisplayClearScreenButton') == 'issueslip' %]
623	<span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>	623	<span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
624	<span id="printclearscreen"><a href="#" title="Print slip and clear screen"><i class="fa fa-print"></i></a></span>	624	<span id="printclearscreen"><a href="#" title="Print slip and clear screen"><i class="fa fa-print"></i></a></span>
		625	[% ELSIF Koha.Preference('DisplayClearScreenButton') == 'issueqslip' %]
		626	<span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
		627	<span id="printclearscreenq"><a href="#" title="Print quick slip and clear screen"><i class="fa fa-print"></i></a></span>
625	[% END %]	628	[% END %]
626		629
627	[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]	630	[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]

Lines 82-87 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js (-1 / +4 lines)
82	printx_window("slip");	82	printx_window("slip");
83	window.location.replace("/cgi-bin/koha/circ/circulation.pl");	83	window.location.replace("/cgi-bin/koha/circ/circulation.pl");
84	});	84	});
		85	$("#printclearscreenq").click(function(){
		86	printx_window("qslip");
		87	window.location.replace("/cgi-bin/koha/circ/circulation.pl");
		88	});
85	$("#searchtohold").click(function(){	89	$("#searchtohold").click(function(){
86	searchToHold();	90	searchToHold();
87	return false;	91	return false;
88	-

Return to bug 29129

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug29129.pl (+16 lines)
	1	use Modern::Perl;
	2
	3	return {
	4	bug_number => "29129",
	5	description => "Update the DisplayClearnScreenButton system pref to allow for a choice between ISSUESLIP and ISSUEQSLIP",
	6	up => sub {
	7	my ($args) = @_;
	8	my ($dbh, $out) = @$args{qw(dbh out)};
	9	# Do you stuffs here
	10	$dbh->do(q{
	11	UPDATE systempreferences SET options = 'no\|issueslip\|issueqslip', type = 'Choice', value = REPLACE( value, 0, 'no'), value = REPLACE( value, 1, 'issueslip') WHERE variable = 'DisplayClearScreenButton';
	12	});
	13	# Print useful stuff here
	14	say $out "Database updated for Bug 29129";
	15	},
	16	};