From a45f788d699024a3369939a9e3f3809ed008d2fc Mon Sep 17 00:00:00 2001 From: Chris Nighswonger Date: Thu, 11 Feb 2010 14:35:24 -0500 Subject: [PATCH] Enhancement: [3.4] [2/2] Web-based checkout enhancements Necessary db schema, updatedatabase.pl, and syspref sql updates. NOTE: This may require translation. NOTE: This leaves the db minor rev as .XXX and therefore does not modify kohaversion.pl. --- installer/data/mysql/en/mandatory/sysprefs.sql | 2 ++ .../1-Obligatoire/unimarc_standard_systemprefs.sql | 2 ++ installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 2 ++ ...m_preferences_full_optimal_for_install_only.sql | 2 ++ ...m_preferences_full_optimal_for_install_only.sql | 2 ++ installer/data/mysql/updatedatabase.pl | 8 ++++++++ 6 files changed, 18 insertions(+), 0 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 8bfed37..69e2ec6 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -286,3 +286,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI:Authorized_IPs','','.','Restricts usage of ILS-DI to some IPs','Free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OverduesBlockCirc','noblock','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','noblock|confirmation|block','Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('DisplayMultiPlaceHold','1','Display the ability to place multiple holds or not','','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckTimeout','120000','','Number of milliseconds before session times out (1000 milliseconds/second)','Integer'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckHeader','','70|10','Include the following HTML in the header of the web-based self checkout service','Textarea'); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql index 76db9c9..61f89a4 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql @@ -286,3 +286,5 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'PrintNoticesMaxLines', '0', '', 'If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.', 'Integer' ); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI','0','Active les services ILS-DI Ã l''OPAC.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OverduesBlockCirc','noblock','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','noblock|confirmation|block','Choice'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckTimeout','120000','','Number of milliseconds before session times out (1000 milliseconds/second)','Integer'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckHeader','','70|10','Include the following HTML in the header of the web-based self checkout service','Textarea'); diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql index 3707294..b54c32c 100644 --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql @@ -273,3 +273,5 @@ INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('S INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableOpacSearchHistory', '1', 'Enable or disable opac search history','', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('RoutingListAddReserves','1','If ON the patrons on routing lists are automatically added to holds on the issue.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('soundon','0','Enable circulation sounds during checkin and checkout in the staff interface. Not supported by all web browsers yet.','','YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckTimeout','120000','','Number of milliseconds before session times out (1000 milliseconds/second)','Integer'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckHeader','','70|10','Include the following HTML in the header of the web-based self checkout service','Textarea'); diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql index 2edbe10..255cd4d 100644 --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -291,4 +291,6 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACviewMARC','1','Allow display of MARC view of bibiographic records in OPAC','','YesNo'); -- from 3.00.06.005 +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckTimeout','120000','','Number of milliseconds before session times out (1000 milliseconds/second)','Integer'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckHeader','','70|10','Include the following HTML in the header of the web-based self checkout service','Textarea'); diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql index 130b46b..d239645 100644 --- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -317,4 +317,6 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACviewMARC','1','Allow display of MARC view of bibiographic records in OPAC','','YesNo'); -- from 3.00.06.005 +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckTimeout','120000','','Number of milliseconds before session times out (1000 milliseconds/second)','Integer'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckHeader','','70|10','Include the following HTML in the header of the web-based self checkout service','Textarea'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a0b5c4a..28e6bdf 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3701,6 +3701,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = '3.01.00.XXX'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckTimeout','120000','','Number of milliseconds before session times out (1000 milliseconds/second)','Integer')"); + $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('WebBasedSelfCheckHeader','','70|10','Include the following HTML in the header of the web-based self checkout service','Textarea')"); + print "Upgrade to $DBversion done (Adding new web-based self checkout system preferences: WebBasedSelfCheckTimeout, WebBasedSelfCheckHeader)\n"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) Drop all foreign keys of the table $table -- 1.7.0.4