From 5cb0eeca56058fa8bca4d14f15907d374728cf4f Mon Sep 17 00:00:00 2001 From: Paudet Date: Wed, 7 Jun 2017 15:02:42 -0400 Subject: [PATCH] Bug 11317 - Update the link under reports Signed-off-by: Paudet --- .../intranet-tmpl/prog/en/modules/reports/reports-home.tt | 14 ++++++++++++++ tools/access_files.pl | 8 +++----- 2 files changed, 17 insertions(+), 5 deletions(-) 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 6b47b70..a68dd35 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 @@ -60,6 +60,7 @@
  • Items with no checkouts
  • +<<<<<<< HEAD

    Other

    +======= +

    Other

    + +>>>>>>> Bug 11317 - Update the link under reports diff --git a/tools/access_files.pl b/tools/access_files.pl index a0b8bef..f929f14 100755 --- a/tools/access_files.pl +++ b/tools/access_files.pl @@ -20,9 +20,7 @@ # You should have received a copy of the GNU General Public License along # with Koha; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -use strict; -use warnings; +use Modern::Perl; use C4::Auth; use CGI; @@ -41,8 +39,8 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({template_name => "tools/access_files.tt", query => $input, type => "intranet", - authnotrequired => 0, - flagsrequired => { tools => 'access_files' }, + authnotrequired => 0, + flagsrequired => { tools => 'access_files' }, }); unless(@directories) { -- 1.9.1