From 26df86b1e402416d3a509c958f5123e2a54e683f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 23 Mar 2012 17:05:46 +0100 Subject: [PATCH 1/1] Bug 5354: Followup. Change separator --- installer/data/mysql/sysprefs.sql | 2 ++ installer/data/mysql/updatedatabase.pl | 2 +- .../prog/en/modules/admin/preferences/serials.pref | 2 +- serials/subscription-add.pl | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 3e850b3..ce774fb 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -355,3 +355,5 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OAI-PMH:AutoUpdateSets','0','Automatically update OAI sets when a bibliographic record is created or updated','','YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAllowPublicListCreation',1,'If set, allows opac users to create public lists',NULL,'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAllowSharingPrivateLists',0,'If set, allows opac users to share private lists with other patrons',NULL,'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 e759f6c..db614e1 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5040,7 +5040,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 7de32d9..8b23135 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 e0a60a5..ce9d1f8 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -116,7 +116,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 ); } } -- 1.7.7.3