Bugzilla – Attachment 19354 Details for
Bug 8911
docs/history.txt file missing for about.pl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8911 - history.txt file missing for about.pl
Bug-8911---historytxt-file-missing-for-aboutpl.patch (text/plain), 3.12 KB, created by
Tomás Cohen Arazi (tcohen)
on 2013-07-02 21:46:00 UTC
(
hide
)
Description:
Bug 8911 - history.txt file missing for about.pl
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2013-07-02 21:46:00 UTC
Size:
3.12 KB
patch
obsolete
>From 226bdaa8bee83e6883346af7c2cac205f6a4f7ed Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@gmail.com> >Date: Tue, 2 Jul 2013 18:35:58 -0300 >Subject: [PATCH] Bug 8911 - history.txt file missing for about.pl > >This patch makes Makefile.PL put the history.txt file in the right places >depending on the chosen setup layout, adds a reference to that place in >koha-conf.xml (and debian template version), and finally tweaks about.pl to >use it. > >To test, apply the patch and verify that perl Makefile.PL runs fine, and installing in > - dev > - single > - standard >layouts works as expected. Then go to the about.pl page and see if Koha's history shows there. > >Then, build your packages and test on your newly created instances. > >Regards >To+ >--- > Makefile.PL | 1 + > about.pl | 4 ++-- > debian/templates/koha-conf-site.xml.in | 1 + > etc/koha-conf.xml | 1 + > 4 files changed, 5 insertions(+), 2 deletions(-) > >diff --git a/Makefile.PL b/Makefile.PL >index 22ce8da..b2a247e 100644 >--- a/Makefile.PL >+++ b/Makefile.PL >@@ -266,6 +266,7 @@ my $target_map = { > './check_sysprefs.pl' => 'NONE', > './circ' => 'INTRANET_CGI_DIR', > './course_reserves' => 'INTRANET_CGI_DIR', >+ './docs/history.txt' => { target => 'DOC_DIR', trimdir => -1 }, > './offline_circ' => 'INTRANET_CGI_DIR', > './edithelp.pl' => 'INTRANET_CGI_DIR', > './etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 }, >diff --git a/about.pl b/about.pl >index b9508c6..ef45340 100755 >--- a/about.pl >+++ b/about.pl >@@ -148,8 +148,8 @@ $template->param( table => $table ); > ## Koha time line code > > #get file location >-my $dir = C4::Context->config('intranetdir'); >-open( my $file, "<", "$dir" . "/docs/history.txt" ); >+my $docdir = C4::Context->config('docdir'); >+open( my $file, "<", "$docdir" . "/history.txt" ); > my $i = 0; > > my @rows2 = (); >diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in >index f3da6ec..ab8aff5 100644 >--- a/debian/templates/koha-conf-site.xml.in >+++ b/debian/templates/koha-conf-site.xml.in >@@ -265,6 +265,7 @@ > <intrahtdocs>/usr/share/koha/intranet/htdocs/intranet-tmpl</intrahtdocs> > <includes>/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/includes/</includes> > <logdir>/var/log/koha/__KOHASITE__</logdir> >+ <docdir>/usr/share/doc/koha-common</docdir> > <backupdir>/var/spool/koha/__KOHASITE__</backupdir> > <!-- Enable the two following to allow superlibrarians to download > database and configuration dumps (respectively) from the Export >diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml >index 22529ac..d42f041 100644 >--- a/etc/koha-conf.xml >+++ b/etc/koha-conf.xml >@@ -284,6 +284,7 @@ __PAZPAR2_TOGGLE_XML_POST__ > <intrahtdocs>__INTRANET_TMPL_DIR__</intrahtdocs> > <includes>__INTRANET_TMPL_DIR__/prog/en/includes/</includes> > <logdir>__LOG_DIR__</logdir> >+ <docdir>__DOC_DIR__</docdir> > <backupdir>__BACKUP_DIR__</backupdir> > <!-- Enable the two following to allow superlibrarians to download > database and configuration dumps (respectively) from the Export >-- >1.8.1.2
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 8911
:
19354
|
19452
|
19827