This patch does not apply cleanly to the 3.4.x branch. Please fixup and resubmit with [3.4.x] in the subject line.
Kind Regards, Chris On Thu, May 12, 2011 at 2:46 AM, Chris Cormack <[email protected]>wrote: > From: Marcel de Rooy <[email protected]> > > Follow up patch for installing pref BasketConfirmations. > > Signed-off-by: Chris Cormack <[email protected]> > --- > installer/data/mysql/de-DE/mandatory/sysprefs.sql | 3 ++- > installer/data/mysql/en/mandatory/sysprefs.sql | 1 + > .../1-Obligatoire/unimarc_standard_systemprefs.sql | 3 ++- > installer/data/mysql/it-IT/necessari/sysprefs.sql | 1 + > .../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql | 1 + > installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 3 ++- > ...m_preferences_full_optimal_for_install_only.sql | 3 ++- > ...m_preferences_full_optimal_for_install_only.sql | 1 + > installer/data/mysql/updatedatabase.pl | 7 +++++++ > 9 files changed, 19 insertions(+), 4 deletions(-) > > diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql > b/installer/data/mysql/de-DE/mandatory/sysprefs.sql > index c7c885d..771a676 100755 > --- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql > +++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql > @@ -311,4 +311,5 @@ INSERT INTO `systempreferences` > (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsField','','The MARC field/subfield that contains > alternate holdings information for bibs taht do not have items attached > (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsSeparator','','The string to use to separate > subfields in alternate holdings displays.',NULL,'free'); > INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('OpacHiddenItems' ,'','This syspref allows to define custom rules for > hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for > more informations.','','Textarea'); > -INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > \ No newline at end of file > +INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > +INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', > 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql > b/installer/data/mysql/en/mandatory/sysprefs.sql > index f98b053..9eb4be5 100755 > --- a/installer/data/mysql/en/mandatory/sysprefs.sql > +++ b/installer/data/mysql/en/mandatory/sysprefs.sql > @@ -312,3 +312,4 @@ INSERT INTO `systempreferences` > (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsSeparator','','The string to use to separate > subfields in alternate holdings displays.',NULL,'free'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('OpacHiddenItems','','This syspref allows to define custom rules for > hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more > informations.','','Textarea'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > +INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', > 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > 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 185c74b..271c80f 100755 > --- > a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql > +++ > b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql > @@ -312,4 +312,5 @@ INSERT INTO `systempreferences` > (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsField','','The MARC field/subfield that contains > alternate holdings information for bibs taht do not have items attached > (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsSeparator','','The string to use to separate > subfields in alternate holdings displays.',NULL,'free'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('OpacHiddenItems','','This syspref allows to define custom rules for > hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more > informations.','','Textarea'); > -INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > \ No newline at end of file > +INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > +INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', > 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql > b/installer/data/mysql/it-IT/necessari/sysprefs.sql > index fca0cfb..3a06cc9 100755 > --- a/installer/data/mysql/it-IT/necessari/sysprefs.sql > +++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql > @@ -299,3 +299,4 @@ INSERT INTO `systempreferences` > (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsSeparator','','The string to use to separate > subfields in alternate holdings displays.',NULL,'free'); > INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('OpacHiddenItems','','This syspref allows to define custom rules for > hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for > more informations.','','Textarea'); > INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > +INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', > 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql > b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql > index b1c6fb5..357dd9a 100644 > --- a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql > +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql > @@ -320,3 +320,4 @@ INSERT INTO systempreferences > (variable,value,explanation,options,type) VALUES ( > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('OpacFavicon','','Enter a complete URL to an image to replace the > default Koha favicon on the OPAC','','free'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the > default Koha favicon on the Staff client','','free'); > INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all > subdivisions for subject tracings.','1','YesNo'); > +INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', > 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql > b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql > index c39e231..ea4e2e7 100755 > --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql > +++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql > @@ -310,4 +310,5 @@ INSERT INTO `systempreferences` > (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsField','','The MARC field/subfield that contains > alternate holdings information for bibs taht do not have items attached > (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsSeparator','','The string to use to separate > subfields in alternate holdings displays.',NULL,'free'); > INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('OpacHiddenItems','','This syspref allows to define custom rules for > hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more > informations.','','Textarea'); > -INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > \ No newline at end of file > +INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > +INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', > 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > 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 a7c6a10..42f537f 100755 > --- > 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 > @@ -365,4 +365,5 @@ INSERT INTO `systempreferences` > (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsField','','The MARC field/subfield that contains > alternate holdings information for bibs taht do not have items attached > (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsSeparator','','The string to use to separate > subfields in alternate holdings displays.',NULL,'free'); > INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('OpacHiddenItems','','This syspref allows to define custom rules for > hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more > informations.','','Textarea'); > -INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > \ No newline at end of file > +INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > +INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', > 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > 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 f370766..26f2c26 100755 > --- > 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 > @@ -391,3 +391,4 @@ INSERT INTO `systempreferences` > (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES('AlternateHoldingsSeparator','','The string to use to separate > subfields in alternate holdings displays.',NULL,'free'); > INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('OpacHiddenItems','','This syspref allows to define custom rules for > hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for > more informations.','','Textarea'); > INSERT INTO systempreferences (variable,value,explanation,options,type) > VALUES('numSearchRSSResults',50,'Specify the maximum number of results to > display on a RSS page of results',NULL,'Integer'); > +INSERT INTO `systempreferences` (variable,value,explanation,options,type) > VALUES ('BasketConfirmations', '1', 'When closing or reopening a basket,', > 'always ask for confirmation.|do not ask for confirmation.', 'Choice'); > diff --git a/installer/data/mysql/updatedatabase.plb/installer/data/mysql/ > updatedatabase.pl > index 52951e7..581e273 100755 > --- a/installer/data/mysql/updatedatabase.pl > +++ b/installer/data/mysql/updatedatabase.pl > @@ -4332,6 +4332,13 @@ if ( C4::Context->preference("Version") < > TransformToNum($DBversion) ) { > SetVersion($DBversion); > } > > +$DBversion = "3.05.00.XXX"; > +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > + $dbh->do("INSERT INTO `systempreferences` > (variable,value,explanation,options,type) VALUES ('BasketConfirmations', > '1', 'When closing or reopening a basket,', 'always ask for confirmation.|do > not ask for confirmation.', 'Choice');"); > + print "Upgrade to $DBversion done (Adds pref BasketConfirmations)\n"; > + SetVersion($DBversion); > +} > + > =head1 FUNCTIONS > > =head2 DropAllForeignKeys($table) > -- > 1.7.4.1 > > _______________________________________________ > Koha-patches mailing list > [email protected] > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches > website : http://www.koha-community.org/ > git : http://git.koha-community.org/ > bugs : http://bugs.koha-community.org/ >
_______________________________________________ Koha-patches mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
