Bugzilla – Attachment 39785 Details for
Bug 11317
Add a way to access files from the intranet
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 11317: Rename publiclogdir with publicdir
SIGNED-OFF-Bug-11317-Rename-publiclogdir-with-publ.patch (text/plain), 3.94 KB, created by
Bernardo Gonzalez Kriegel
on 2015-06-02 18:08:47 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 11317: Rename publiclogdir with publicdir
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2015-06-02 18:08:47 UTC
Size:
3.94 KB
patch
obsolete
>From f39372c4099a2827a6178bf5f7527cdc08a50c2d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Mon, 16 Feb 2015 16:00:49 +0100 >Subject: [PATCH] [SIGNED-OFF] Bug 11317: Rename publiclogdir with publicdir > >Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >--- > 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__ > <use_zebra_facets>1</use_zebra_facets> > <queryparser_config>/etc/koha/searchengine/queryparser.yaml</queryparser_config> > >+ <!-- Public directory, uncomment the following line and define a valid path to let the intranet user access it--> >+ <!-- <publicdir></publicdir> --> >+ > <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm --> > <ttf> > <font type="TR" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf</font> >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__ > <use_zebra_facets>1</use_zebra_facets> > <queryparser_config>__KOHA_CONF_DIR__/searchengine/queryparser.yaml</queryparser_config> > >+ <!-- Public directory, uncomment the following line and define a valid path to let the intranet user access it--> >+ <!-- <publicdir></publicdir> --> >+ > <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm --> > <ttf> > <font type="TR" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf</font> >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 @@ > > <h1>Report/log files</h1> > >-[% IF ( error_no_publiclogdir ) %] >- <div class="dialog alert"><strong>Error : </strong>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.</div> >+[% IF ( error_no_publicdir ) %] >+ <div class="dialog alert"><strong>Error : </strong>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.</div> > [% ELSE %] > [% IF ( files_loop ) %] > <table id="files"> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11317
:
23203
|
25387
|
27492
|
27579
|
27604
|
35938
|
35939
|
35940
|
36844
|
39783
|
39784
|
39785
|
39786
|
44859
|
44860
|
48629
|
48635
|
49941
|
49942
|
49943
|
49944
|
49945
|
49946
|
49947
|
50421
|
50424
|
50425
|
50440
|
53446
|
58220
|
58221
|
58222
|
58223
|
58224
|
58225
|
58226
|
62971
|
62972
|
62973
|
62974
|
62975
|
64088
|
64089
|
65691
|
65851
|
65855
|
65856
|
65857
|
65909
|
65910
|
65911
|
65912
|
65913
|
65914
|
65915
|
65918
|
66091
|
66092
|
66093
|
66094
|
66095
|
66096
|
66097
|
66098
|
66099
|
66100
|
72097
|
72309
|
72456
|
72457
|
72458
|
72459
|
72460
|
72461
|
72462
|
72463
|
72464
|
72465
|
74119
|
74379
|
74756
|
74911
|
74912
|
74916
|
74917
|
74918
|
74919
|
75019