From 7b27b9ecb2a8f628af3bbc8f387442a47195f152 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Mon, 1 Feb 2010 17:44:21 +0100 Subject: [PATCH] MT2116, Follow-up: CSV Export, fix backporting bugs --- C4/Koha.pm | 2 +- C4/Record.pm | 1 - installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/Koha.pm b/C4/Koha.pm index dc10a6e5d7..544f3a22a7 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -1110,7 +1110,7 @@ sub GetKohaAuthorisedValuesFromField { my $dbh = C4::Context->dbh; my $avcode = GetAuthValCodeFromField($field, $subfield, $fwcode); if ($avcode) { - my $sth = $dbh->prepare("select authorised_value, lib, lib_opac from authorised_values where category=? "); + my $sth = $dbh->prepare("select authorised_value, lib from authorised_values where category=? "); $sth->execute($avcode); while ( my ($val, $lib, $lib_opac) = $sth->fetchrow_array ) { $values{$val} = ($opac && $lib_opac) ? $lib_opac : $lib; diff --git a/C4/Record.pm b/C4/Record.pm index 65f3f7a39c..bce362b506 100644 --- a/C4/Record.pm +++ b/C4/Record.pm @@ -360,7 +360,6 @@ sub marc2csv { ($preprocess,$postprocess, $fieldprocessing) = YAML::LoadFile($configfile); } - warn $fieldprocessing; # Preprocessing eval $preprocess if ($preprocess); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql index 5fea3a816c..785b5e30a7 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql @@ -16,6 +16,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (13, 'delete_anonymize_patrons', 'Delete old borrowers and anonymize circulation history (deletes borrower reading history)'), (13, 'batch_upload_patron_images', 'Upload patron images in batch or one at a time'), (13, 'schedule_tasks', 'Schedule tasks to run'), + (13, 'manage_csv_profiles', 'Manage CSV export profiles'), (15, 'check_expiration', 'Check the expiration of a serial'), (15, 'claim_serials', 'Claim missing serials'), (15, 'create_subscription', 'Create a new subscription'), -- 2.20.1