From 0872bf8c2e7d6404fe297a542a4b644f5e47cd9d Mon Sep 17 00:00:00 2001 From: Roch D'Amour Date: Thu, 22 Feb 2018 13:43:46 -0500 Subject: [PATCH] Bug 11317 - File with same name in different directories now has distinct hash + QA followup --- .../prog/en/modules/reports/reports-home.tt | 24 ++++++++--------- .../prog/en/modules/tools/access_files.tt | 31 +++++++++++----------- tools/access_files.pl | 2 +- 3 files changed, 29 insertions(+), 28 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 557b16c..ff0a13a 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 @@ -49,27 +49,27 @@

Top lists

- -

Inactive

- +

Inactive

+ -

Other

-
+ 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 1f8a394..4999565 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,21 +1,9 @@ [% INCLUDE 'doc-head-open.inc' %] Report/log files [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'header.inc' %] @@ -63,4 +51,17 @@ [% INCLUDE 'tools-menu.inc' %] -[% INCLUDE 'intranet-bottom.inc' %] + +[% INCLUDE 'intranet-bottom.inc' %] \ No newline at end of file diff --git a/tools/access_files.pl b/tools/access_files.pl index 0fb57af..61b3abe 100755 --- a/tools/access_files.pl +++ b/tools/access_files.pl @@ -53,8 +53,8 @@ else { foreach my $dir(@directories){ opendir(DIR, $dir); foreach my $filename (readdir(DIR)) { - my $id = md5_hex($filename); my $full_path = "$dir/$filename"; + my $id = md5_hex($full_path); next if ($filename =~ /^\./ or -d $full_path); my $st = stat($full_path); -- 2.7.4