From 0b43ce73e4f5eb4514fc75325a3a71d2d2b2bca8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 5 Sep 2012 11:02:29 +0200 Subject: [PATCH] Bug 7986: Followup: Replace DontExportFields and CsvProfileForExport Replace DontExportFieldsi by ExportRemoveFields and CsvProfileForExport by ExportWithCsvProfile --- circ/circulation.pl | 4 ++-- installer/data/mysql/updatedatabase.pl | 8 ++++---- tools/export.pl | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 2a884a1..c3604f8 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -732,8 +732,8 @@ $template->param( AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), dateformat => C4::Context->preference("dateformat"), DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), - dont_export_fields => C4::Context->preference("DontExportFields"), - csv_profile_for_export => C4::Context->preference("CsvProfileForExport"), + dont_export_fields => C4::Context->preference("ExportRemoveFields"), + csv_profile_for_export => C4::Context->preference("ExportWithCsvProfile"), canned_bor_notes_loop => $canned_notes, ); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f797e5a..89e3f5a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5687,18 +5687,18 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { $DBversion = "3.09.00.XXX"; if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { $dbh->do(qq{ - INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('DontExportFields','','List of fields for non export in circulation.pl (separated by a space)','',''); + INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('ExportRemoveFields','','List of fields for non export in circulation.pl (separated by a space)','',''); }); - print "Upgrade to $DBversion done (Add system preference DontExportFields)\n"; + print "Upgrade to $DBversion done (Add system preference ExportRemoveFields)\n"; SetVersion($DBversion); } $DBversion = "3.09.00.XXX"; if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { $dbh->do(qq{ - INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('CsvProfileForExport','','Set a profile name for CSV export','',''); + INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('ExportWithCsvProfile','','Set a profile name for CSV export','',''); }); - print "Upgrade to $DBversion done (Adds New System preference CsvProfileForExport)\n"; + print "Upgrade to $DBversion done (Adds New System preference ExportWithCsvProfile)\n"; SetVersion($DBversion) } diff --git a/tools/export.pl b/tools/export.pl index d3766c9..a448a76 100755 --- a/tools/export.pl +++ b/tools/export.pl @@ -394,7 +394,7 @@ if ( $op eq "export" ) { my @itemnumbers = $query->param("itemnumbers"); my $output = marc2csv( \@biblionumbers, - GetCsvProfileId( C4::Context->preference('CsvProfileForExport') ), + GetCsvProfileId( C4::Context->preference('ExportWithCsvProfile') ), \@itemnumbers, ); print $query->header( -type => 'application/octet-stream', @@ -468,7 +468,7 @@ else { itemtypeloop => \@itemtypesloop, DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), authtypeloop => \@authtypesloop, - dont_export_fields => C4::Context->preference("DontExportFields"), + dont_export_fields => C4::Context->preference("ExportRemoveFields"), ); output_html_with_http_headers $query, $cookie, $template->output; -- 1.7.10.4