[Koha-patches] [PATCH] [3.4.X] 4959: Language inconsistencies on basket groups; skip confirmation when closing basket.

[Chris Nighswonger]

Hey Marcel,

Do you have a public git repo I can pull this from?

Kind Regards,
Chris

On Thu, Aug 4, 2011 at 7:51 AM, Marcel de Rooy <M.de.Rooy at rijksmuseum.nl>wrote:

> Follow up patch for installing pref BasketConfirmations.
>
> Rebased for 3.4.X August 4, 2011.
> ---
>  installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    2 ++
>  installer/data/mysql/en/mandatory/sysprefs.sql     |    2 ++
>  .../1-Obligatoire/unimarc_standard_systemprefs.sql |    1 +
>  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  |    2 ++
>  ...m_preferences_full_optimal_for_install_only.sql |    1 +
>  ...m_preferences_full_optimal_for_install_only.sql |    1 +
>  installer/data/mysql/updatedatabase.pl             |    7 +++++++
>  9 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql
> b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
> index 16eba0b..ec0e85c 100755
> --- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql
> +++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
> @@ -311,3 +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 ('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 e0d1f93..f313a39 100755
> --- a/installer/data/mysql/en/mandatory/sysprefs.sql
> +++ b/installer/data/mysql/en/mandatory/sysprefs.sql
> @@ -311,3 +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/OpacHiddenItems.txt for more
> informations.','','Textarea');
>
> +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 bf6132d..52a95d3 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 ('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 b6ecc99..e49a22f 100755
> --- a/installer/data/mysql/it-IT/necessari/sysprefs.sql
> +++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql
> @@ -298,4 +298,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 ('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 3b31451..0a96d52 100755
> --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
> +++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
> @@ -310,3 +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 ('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 226a3a1..72dfdf4 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 ('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 54b62b4..78360a7 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
> @@ -390,4 +390,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 ('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 3a7d709..4ef59b3 100755
> --- a/installer/data/mysql/updatedatabase.pl
> +++ b/installer/data/mysql/updatedatabase.pl
> @@ -4363,6 +4363,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.6.0.6
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20110810/bb950f58/attachment-0001.htm>