Attachment 3509 Details for Bug 3924 – Patch for 3.4

[patch] Patch for 3.4

0001-bug-3924-MT2500-fix-useDaysMode-use.patch (text/plain), 4.12 KB, created by Chris Cormack on 2011-03-29 21:25:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2011-03-29 21:25:27 UTC

Size: 4.12 KB

patch

obsolete

>From 2224ad0eec028f8c164add93bdbb4f24eef482e1 Mon Sep 17 00:00:00 2001
>From: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
>Date: Tue, 15 Dec 2009 11:22:33 +0100
>Subject: [PATCH] (bug #3924 MT2500) fix useDaysMode use
>
>This fix system preference choices, and delete some useless code.
>
>Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
>---
> .../1-Obligatoire/unimarc_standard_systemprefs.sql |    2 +-
> installer/data/mysql/updatedatabase.pl             |    8 ++++++++
> kohaversion.pl                                     |    2 +-
> 3 files changed, 10 insertions(+), 2 deletions(-)
>
>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 68d78a0..02a71be 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
>@@ -117,7 +117,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('timeout', '30600', 'Ce paramÃ¨tre dÃ©finit la durÃ©e d''inactivitÃ© au delÃ  de laquelle l''utilisateur (professionnel ou opac) est automatiquement dÃ©connectÃ©', '', 'Integer');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('TransfersMaxDaysWarning', '3', 'DÃ©lai maximum au delÃ  duquel un transfert sera considÃ©rÃ© comme ayant rencontrÃ© un problÃ¨me', '', 'Integer');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('uppercasesurnames', '0', 'Force les noms de famille Ã  Ãªtre en majuscule', NULL, 'YesNo');
>-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('useDaysMode', 'Calendar', 'Comment calculer les dates de retour : ''Calendar'' signifie que les dates de retour sauteront les jours fermÃ©s. ''Days'' ignore le calendrier', 'Calendar|Days', 'Choice');
>+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('useDaysMode', 'Calendar', 'Comment calculer les dates de retour : ''Calendar'' signifie que les dates de retour sauteront les jours fermÃ©s. ''Days'' ignore le calendrier', 'Calendar|Days|Datedue', 'Choice');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('virtualshelves', '1', 'Si ce paramÃ¨tre est activÃ©, les adhÃ©rents (identifiÃ©s) peuvent crÃ©er des Ã©tagÃ¨res virtuelles', '', 'YesNo');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('z3950AuthorAuthFields', '701,702,700', 'Ce paramÃ¨tre permet de remplir automatiquement le champ 200$f (s''il est vide) avec le champ 700$a. Utile pour l''affichage, mais pas vraiment rigoureux du point de vue de la norme UNIMARC.', '', '');
> INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('z3950NormalizeAuthor', '0', 'Si activÃ©, les autoritÃ©s auteur servent Ã  remplir le champ 200$f s''il est vide (paramÃ¨tre spÃ©cifique Ã  l''UNIMARC', NULL, NULL);
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 23b5d67..b0604e7 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -4134,6 +4134,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>     SetVersion ($DBversion);
> }
> 
>+$DBversion = "3.03.00.XXX";
>+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>+	$dbh->do("UPDATE systempreferences SET options = 'Calendar|Days|Datedue' WHERE variable = 'useDaysMode'");
>+	
>+    print "Upgrade to $DBversion done (upgrade useDaysMode syspref)\n";
>+    SetVersion ($DBversion);
>+}
>+
> =head1 FUNCTIONS
> 
> =head2 DropAllForeignKeys($table)
>diff --git a/kohaversion.pl b/kohaversion.pl
>index 3fbc4e1..8330459 100644
>--- a/kohaversion.pl
>+++ b/kohaversion.pl
>@@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
> use strict;
> 
> sub kohaversion {
>-    our $VERSION = '3.03.00.032';
>+    our $VERSION = '3.03.00.XXX';
>     # version needs to be set this way
>     # so that it can be picked up by Makefile.PL
>     # during install
>-- 
>1.7.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 3924: 3509 | 4324 | 4325