From a52d3fbf9d46528bf108584f90e04f98c6521ac8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 23 Mar 2012 17:05:46 +0100 Subject: [PATCH] Bug 5354: Followup. Change separator --- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 2 +- .../prog/en/modules/admin/preferences/serials.pref | 2 +- serials/subscription-add.pl | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index b9f6bf1acb..4a12a17759 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -358,3 +358,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('Babeltheque_url_js','','Url for Babeltheque javascript (e.g. http://www.babeltheque.com/bw_XX.js)','','Free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('Babeltheque_url_update', '', 'Url for Babeltheque update (E.G. http://www.babeltheque.com/.../file.csv.bz2)', '', 'Free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('SocialNetworks','1','Enable/Disable social networks links in opac detail pages','','YesNo'); +INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('SubscriptionDuplicateDroppedInput','','','List of fields which must not be rewritten when a subscription is duplicated (Separated by pipe |)','Free'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f8ab4ad443..5b82f97a02 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5090,7 +5090,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { $DBversion = "3.07.00.XXX"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { - $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('SubscriptionDuplicateDroppedInput','','','List of fields which must not be rewritten when a subscription is duplicated (Separated by semicolon)','Free')"); + $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('SubscriptionDuplicateDroppedInput','','','List of fields which must not be rewritten when a subscription is duplicated (Separated by pipe |)','Free')"); print "Upgrade to $DBversion done (Add System Preferences SubscriptionDuplicateDroppedInput)\n"; SetVersion($DBversion); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref index 7de32d99fc..8b2313576d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref @@ -48,5 +48,5 @@ Serials: full: a full list - of the serial issues. - - - List of fields which must not be rewritten when a subscription is duplicated (Separated by semicolon) + - List of fields which must not be rewritten when a subscription is duplicated (Separated by pipe |) - pref: SubscriptionDuplicateDroppedInput diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index e4a9f7df2b..b0f3625343 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -115,7 +115,7 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { if ( $op eq 'dup' ) { my $dont_copy_fields = C4::Context->preference('SubscriptionDuplicateDroppedInput'); - my @fields_id = map { fieldid => $_ }, split ';', $dont_copy_fields; + my @fields_id = map { fieldid => $_ }, split '|', $dont_copy_fields; $template->param( dont_export_field_loop => \@fields_id ); } } -- 2.20.1