From f39372c4099a2827a6178bf5f7527cdc08a50c2d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 16 Feb 2015 16:00:49 +0100 Subject: [PATCH] [SIGNED-OFF] Bug 11317: Rename publiclogdir with publicdir Signed-off-by: Jonathan Druart Signed-off-by: Bernardo Gonzalez Kriegel --- debian/templates/koha-conf-site.xml.in | 3 +++ etc/koha-conf.xml | 3 +++ .../prog/en/modules/reports/report_files.tt | 4 ++-- reports/report_files.pl | 6 +++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in index 7049cba..1b2b564 100644 --- a/debian/templates/koha-conf-site.xml.in +++ b/debian/templates/koha-conf-site.xml.in @@ -283,6 +283,9 @@ __END_SRU_PUBLICSERVER__ 1 /etc/koha/searchengine/queryparser.yaml + + + /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml index 289d51d..69a90e5 100644 --- a/etc/koha-conf.xml +++ b/etc/koha-conf.xml @@ -115,6 +115,9 @@ __PAZPAR2_TOGGLE_XML_POST__ 1 __KOHA_CONF_DIR__/searchengine/queryparser.yaml + + + /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/report_files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/report_files.tt index 3ee409e..a289b62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/report_files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/report_files.tt @@ -32,8 +32,8 @@

Report/log files

-[% IF ( error_no_publiclogdir ) %] -
Error : Report/log files could not be found because the "publiclogdir" option was not set in "koha-conf.xml". Contact your system administrator to add this option.
+[% IF ( error_no_publicdir ) %] +
Error : Report/log files could not be found because the "publicdir" option was not set in "koha-conf.xml". Contact your system administrator to add this option.
[% ELSE %] [% IF ( files_loop ) %] diff --git a/reports/report_files.pl b/reports/report_files.pl index 3976ecb..2bc784f 100755 --- a/reports/report_files.pl +++ b/reports/report_files.pl @@ -3,7 +3,7 @@ # Frédérick Capovilla, 2011 - Libéo # # Show a list of all the files in the directory specified by the option -# "publiclogdir" in koha-conf.xml so they can be downloaded by users with the +# "publicdir" in koha-conf.xml so they can be downloaded by users with the # "reports" permission. # # This file is part of Koha. @@ -33,7 +33,7 @@ use Digest::MD5 qw(md5_hex); my $input = new CGI; my $file_id = $input->param("id"); -my $directory = C4::Context->config('publiclogdir'); +my $directory = C4::Context->config('publicdir'); my ($template, $borrowernumber, $cookie) = get_template_and_user({template_name => "reports/report_files.tt", @@ -44,7 +44,7 @@ my ($template, $borrowernumber, $cookie) }); unless($directory) { - $template->param(error_no_publiclogdir => 1); + $template->param(error_no_publicdir => 1); } else { #Get the files list -- 1.7.9.5