From 08e28db4e3c5813ff476a99f853c26d984abafb1 Mon Sep 17 00:00:00 2001 From: Kenichi Ishigaki Date: Sat, 3 May 2025 18:45:51 +0900 Subject: [PATCH] Use distvname instead of dist not to check distributions with different versions --- lib/pause_2017/PAUSE/Web/Controller/User/Files.pm | 4 ++-- lib/pause_2017/templates/user/files/delete.html.ep | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm b/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm index d48bc3ca4..7d6cc0472 100644 --- a/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm +++ b/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm @@ -176,11 +176,11 @@ sub delete { my $tmpf = $f; $tmpf =~ s/\.(?:readme|meta)$/.tar.gz/; my $info = CPAN::DistnameInfo->new($tmpf); - my $dist = $info->dist; + my $distv = $info->distvname; my $blurb = $deletes{$f} ? $c->scheduled($whendele{$f}) : HTTP::Date::time2str((stat _)[9]); - $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f}, dist => $dist }; + $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f}, distv => $distv }; $pause->{deleting_indexed_files} = 1 if $deletes{$f} && $indexed->{$f}; } $pause->{files} = \%files; diff --git a/lib/pause_2017/templates/user/files/delete.html.ep b/lib/pause_2017/templates/user/files/delete.html.ep index 0b2a4e90f..f159dc89a 100644 --- a/lib/pause_2017/templates/user/files/delete.html.ep +++ b/lib/pause_2017/templates/user/files/delete.html.ep @@ -29,7 +29,7 @@ % for my $file (sort keys %$files) { - <%= check_box "pause99_delete_files_FILE" => $file, 'data-dist' => $files->{$file}{dist} %> + <%= check_box "pause99_delete_files_FILE" => $file, 'data-distv' => $files->{$file}{distv} %> % if ($files->{$file}{indexed}) { <%= $file %> [indexed] % } else { @@ -54,8 +54,8 @@ var List = new List('files', { document.querySelectorAll('input[type=checkbox]').forEach(function(e) { e.addEventListener('change', function(ev) { var checked = ev.currentTarget.checked; - var dist = ev.currentTarget.getAttribute('data-dist'); - document.querySelectorAll('input[data-dist='+dist+']').forEach(function(e) { + var distv = ev.currentTarget.getAttribute('data-distv'); + document.querySelectorAll('input[data-distv="'+distv+'"]').forEach(function(e) { e.checked = checked; }); })