Bugzilla – Attachment 74912 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]
Bug 11317: (follow-up) Add two-level entry to koha-conf and remove unwanted characters
Bug-11317-follow-up-Add-two-level-entry-to-koha-co.patch (text/plain), 4.62 KB, created by
Kyle M Hall (khall)
on 2018-04-27 12:45:08 UTC
(
hide
)
Description:
Bug 11317: (follow-up) Add two-level entry to koha-conf and remove unwanted characters
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2018-04-27 12:45:08 UTC
Size:
4.62 KB
patch
obsolete
>From b2eb6310e5ad6d0d65e3b3e5c4a0b820a5b4ea42 Mon Sep 17 00:00:00 2001 >From: Roch D'Amour <roch.damour@inlibro.com> >Date: Mon, 23 Apr 2018 09:20:35 -0400 >Subject: [PATCH] Bug 11317: (follow-up) Add two-level entry to koha-conf and > remove unwanted characters > >- Removed merge marker >- Changed include path in favor of using the Asset tt plugin (bug 20538) >- Changed access_dir to a two-level entry for clarity > >Test plans stay the same, just make sure that the two-level configuration entry >work properly and everything pass QA. > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > debian/templates/koha-conf-site.xml.in | 7 ++++++- > etc/koha-conf.xml | 7 ++++++- > .../intranet-tmpl/prog/en/modules/reports/reports-home.tt | 1 - > .../intranet-tmpl/prog/en/modules/tools/access_files.tt | 5 +++-- > tools/access_files.pl | 15 +++++++++++++-- > 5 files changed, 28 insertions(+), 7 deletions(-) > >diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in >index 3c2aa46e44..0a4f02eeab 100644 >--- a/debian/templates/koha-conf-site.xml.in >+++ b/debian/templates/koha-conf-site.xml.in >@@ -297,7 +297,12 @@ __END_SRU_PUBLICSERVER__ > <api_secret_passphrase>__API_SECRET__</api_secret_passphrase> > > <!-- Accessible directory from the staff client, uncomment the following line and define a valid path to let the intranet user access it--> >- <!-- <access_dir></access_dir> --> >+ <!-- >+ <access_dirs> >+ <access_dir></access_dir> >+ <access_dir></access_dir> >+ </access_dirs> >+ --> > > <!-- true type font mapping according to type from $font_types in C4/Creators/Lib.pm --> > <ttf> >diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml >index 37b304c2db..1b50f77a45 100644 >--- a/etc/koha-conf.xml >+++ b/etc/koha-conf.xml >@@ -128,7 +128,12 @@ __PAZPAR2_TOGGLE_XML_POST__ > <api_secret_passphrase>CHANGEME</api_secret_passphrase> > > <!-- Accessible directory from the staff client, uncomment the following line and define a valid path to let the intranet user access it--> >- <!-- <access_dir></access_dir> --> >+ <!-- >+ <access_dirs> >+ <access_dir></access_dir> >+ <access_dir></access_dir> >+ </access_dirs> >+ --> > > <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm --> > <ttf> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >index 86d58ba520..ea1d67b56d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt >@@ -63,7 +63,6 @@ > > </div> > >-<<<<<<< 3dd4c261c3d9d152edb12ead6b10b71b44418eab > <div class="col-xs-6"><h2>Top lists</h2> > <ul> > <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt >index 34e4922b81..316509892a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Report/log files</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > <body> > [% INCLUDE 'header.inc' %] >@@ -52,7 +53,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/tools/access_files.pl b/tools/access_files.pl >index 4f58123663..417501774b 100755 >--- a/tools/access_files.pl >+++ b/tools/access_files.pl >@@ -34,8 +34,19 @@ use Encode; > > my $input = new CGI; > my $file_id = $input->param("id"); >-my $access_dir = C4::Context->config('access_dir'); >-my @directories = $access_dir ? (ref $access_dir ? @{$access_dir} : ($access_dir)) : (); >+my $access_dirs = C4::Context->config('access_dirs'); >+ >+my @directories; >+ >+if ($access_dirs){ >+ if (ref $access_dirs->{access_dir} ){ >+ @directories = @{$access_dirs->{access_dir}}; >+ } else { >+ @directories =($access_dirs->{access_dir}); >+ } >+} else { >+ @directories = (); >+} > > my ($template, $borrowernumber, $cookie) > = get_template_and_user({template_name => "tools/access_files.tt", >-- >2.15.1 (Apple Git-101)
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