Attachment #67918 for bug #16401

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

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_16401.perl (+8 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3	$dbh->do( "UPDATE systempreferences SET value = CONCAT('http://', value) WHERE variable = 'staffClientBaseURL' AND value NOT LIKE 'http%'" );
	4
	5	# Always end with this (adjust the bug info)
	6	SetVersion( $DBversion );
	7	print "Upgrade to $DBversion done (Bug 16401 - fix potentialy bad set staffClientBaseURL preference)\n";
	8	}

Lines 495-501 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 / +1 lines)
495	('SpineLabelAutoPrint','0','','If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.','YesNo'),	495	('SpineLabelAutoPrint','0','','If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.','YesNo'),
496	('SpineLabelFormat','<itemcallnumber><copynumber>','30\|10','This preference defines the format for the quick spine label printer. Just list the fields you would like to see in the order you would like to see them, surrounded by <>, for example <itemcallnumber>.','Textarea'),	496	('SpineLabelFormat','<itemcallnumber><copynumber>','30\|10','This preference defines the format for the quick spine label printer. Just list the fields you would like to see in the order you would like to see them, surrounded by <>, for example <itemcallnumber>.','Textarea'),
497	('SpineLabelShowPrintOnBibDetails','0','','If turned on, a \"Print Label\" link will appear for each item on the bib details page in the staff interface.','YesNo'),	497	('SpineLabelShowPrintOnBibDetails','0','','If turned on, a \"Print Label\" link will appear for each item on the bib details page in the staff interface.','YesNo'),
498	('staffClientBaseURL','',NULL,'Specify the base URL of the staff client','free'),	498	('staffClientBaseURL','',NULL,'Specify the base URL of the staff client starting with http:// or https://. Do not include a trailing slash in the URL. (This must be filled in correctly for CAS, svc, and load_testing to work.)','free'),
499	('StaffDetailItemSelection', '1', NULL, 'Enable item selection in record detail page', 'YesNo'),	499	('StaffDetailItemSelection', '1', NULL, 'Enable item selection in record detail page', 'YesNo'),
500	('StaffLangSelectorMode','footer','top\|both\|footer','Select the location to display the language selector in staff client','Choice'),	500	('StaffLangSelectorMode','footer','top\|both\|footer','Select the location to display the language selector in staff client','Choice'),
501	('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch\|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),	501	('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch\|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),

Lines 13-22 Staff Client: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref (-2 / +2 lines)
13	choices: staff-templates	13	choices: staff-templates
14	- theme on the staff interface.	14	- theme on the staff interface.
15	-	15	-
16	- "The staff client is located at http://"	16	- "The staff client is located at"
17	- pref: staffClientBaseURL	17	- pref: staffClientBaseURL
18	class: url	18	class: url
19	- . Do not include a trailing slash in the URL.	19	- This should be a complete URL, starting with http:// or https://. Do not include a trailing slash in the URL. (This must be filled in correctly for CAS, svc, and load_testing to work.)
20	-	20	-
21	- Use the CSS stylesheet	21	- Use the CSS stylesheet
22	- pref: intranetstylesheet	22	- pref: intranetstylesheet

Lines 98-104 sub import_bib { Link Here

(-)a/svc/import_bib (-1 / +1 lines)
98	$sth = $dbh->prepare("SELECT overlay_status FROM import_records WHERE import_record_id =?");	98	$sth = $dbh->prepare("SELECT overlay_status FROM import_records WHERE import_record_id =?");
99	$sth->execute($import_record_id);	99	$sth->execute($import_record_id);
100	my $match_status = $sth->fetchrow_arrayref->[0] \|\| 'no_match';	100	my $match_status = $sth->fetchrow_arrayref->[0] \|\| 'no_match';
101	my $url = 'http://'. C4::Context->preference('staffClientBaseURL') .'/cgi-bin/koha/catalogue/detail.pl?biblionumber='. $biblionumber;	101	my $url = C4::Context->preference('staffClientBaseURL') .'/cgi-bin/koha/catalogue/detail.pl?biblionumber='. $biblionumber;
102		102
103	$result->{'status'} = "ok";	103	$result->{'status'} = "ok";
104	$result->{'import_batch_id'} = $batch_id;	104	$result->{'import_batch_id'} = $batch_id;

Lines 41-47 $dbh->{ RaiseError } = 1; Link Here

(-)a/t/db_dependent/Auth_with_cas.t (-1 / +1 lines)
41		41
42	C4::Context->disable_syspref_cache();	42	C4::Context->disable_syspref_cache();
43	t::lib::Mocks::mock_preference('OPACBaseURL','http://localhost');	43	t::lib::Mocks::mock_preference('OPACBaseURL','http://localhost');
44	t::lib::Mocks::mock_preference('staffClientBaseURL','localhost:8080');	44	t::lib::Mocks::mock_preference('staffClientBaseURL','http://localhost:8080');
45		45
46	my $opac_base_url = C4::Context->preference('OpacBaseURL');	46	my $opac_base_url = C4::Context->preference('OpacBaseURL');
47	my $staff_base_url = C4::Context->preference('staffClientBaseURL');	47	my $staff_base_url = C4::Context->preference('staffClientBaseURL');




my $dbh      = C4::Context->dbh;
my $login    = $ENV{KOHA_USER} || 'koha';
my $password = $ENV{KOHA_PASS} || 'koha';
my $base_url= ( $ENV{KOHA_INTRANET_URL} || C4::Context->preference("staffClientBaseURL") ) . "/cgi-bin/koha/";
    = ( $ENV{KOHA_INTRANET_URL} || 'http://' . C4::Context->preference("staffClientBaseURL") )
    . "/cgi-bin/koha/";
my $selenium_addr = $ENV{SELENIUM_ADDR} || 'localhost';
my $selenium_port = $ENV{SELENIUM_PORT} || 4444;



my $number_of_biblios_to_insert = 3;
our $sample_data = {
    category => {
- 

Return to bug 16401

Lines 45-58 use MARC::Field; Link Here

(-)a/t/db_dependent/selenium/basic_workflow.t (-6 / +1 lines)
45	my $dbh = C4::Context->dbh;	45	my $dbh = C4::Context->dbh;
46	my $login = $ENV{KOHA_USER} \|\| 'koha';	46	my $login = $ENV{KOHA_USER} \|\| 'koha';
47	my $password = $ENV{KOHA_PASS} \|\| 'koha';	47	my $password = $ENV{KOHA_PASS} \|\| 'koha';
48	my $base_url	48	my $base_url= ( $ENV{KOHA_INTRANET_URL} \|\| C4::Context->preference("staffClientBaseURL") ) . "/cgi-bin/koha/";
49	= ( $ENV{KOHA_INTRANET_URL} \|\| 'http://' . C4::Context->preference("staffClientBaseURL") )
50	. "/cgi-bin/koha/";
51	my $selenium_addr = $ENV{SELENIUM_ADDR} \|\| 'localhost';	49	my $selenium_addr = $ENV{SELENIUM_ADDR} \|\| 'localhost';
52	my $selenium_port = $ENV{SELENIUM_PORT} \|\| 4444;	50	my $selenium_port = $ENV{SELENIUM_PORT} \|\| 4444;
53		51
54
55
56	my $number_of_biblios_to_insert = 3;	52	my $number_of_biblios_to_insert = 3;
57	our $sample_data = {	53	our $sample_data = {
58	category => {	54	category => {
59	-