From ef8fc3fe0272577884fb0e7f10db609554c17a8a Mon Sep 17 00:00:00 2001 From: Paudet Date: Thu, 10 Aug 2017 15:45:26 -0400 Subject: [PATCH] Bug 11317 - Follow-up - Fixing merge error and cosmetic changes --- koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc | 3 +++ koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt | 2 +- tools/access_files.pl | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc index d7b40cf..2131f68 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -125,4 +125,7 @@ [% IF ( CAN_user_tools_upload_general_files ) %]
  • Upload any file
  • [% END %] + [% IF ( CAN_user_tools_access_files ) %] +
  • Report/log files
  • + [% END %] 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 e243062..557b16c 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 @@ -68,7 +68,6 @@
  • Average loan time
  • Koha database schema
  • Koha reports library
  • -
  • Report/log files
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index 6aa69ed..da1884b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -116,7 +116,7 @@ [% IF CAN_user_tools_access_files %]
    Report/log files
    -
    Report/log files
    +
    Access report or log files
    [% END %] diff --git a/tools/access_files.pl b/tools/access_files.pl index 20aeb4c..0fb57af 100755 --- a/tools/access_files.pl +++ b/tools/access_files.pl @@ -96,7 +96,7 @@ else { } close $fh; - exit(1); + exit(0); } else{ # Send the file list to the template -- 1.9.1