diff --git a/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm b/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm index d5e3602b8..822fc3790 100644 --- a/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm +++ b/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm @@ -4,7 +4,6 @@ use Mojo::Base "Mojolicious::Controller"; use HTTP::Date (); use File::pushd; use PAUSE (); -use CPAN::DistnameInfo; sub show { my $c = shift; @@ -49,11 +48,10 @@ sub show { warn "ALERT: Could not stat f[$f]: $!"; next; } - my $modified = (stat _)[9]; my $blurb = $deletes{$f} ? $c->scheduled($whendele{$f}) : - HTTP::Date::time2str($modified); - $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f}, modified => $modified }; + HTTP::Date::time2str((stat _)[9]); + $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f} }; } $pause->{files} = \%files; } @@ -174,15 +172,10 @@ sub delete { warn "ALERT: Could not stat f[$f]: $!"; next; } - my $tmpf = $f; - $tmpf =~ s/\.(?:readme|meta)$/.tar.gz/; - my $info = CPAN::DistnameInfo->new($tmpf); - my $distv = $info->distvname; - my $modified = (stat _)[9]; my $blurb = $deletes{$f} ? $c->scheduled($whendele{$f}) : - HTTP::Date::time2str($modified); - $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f}, distv => $distv, modified => $modified }; + HTTP::Date::time2str((stat _)[9]); + $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f} }; $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 2d182bae7..6bd26d07d 100644 --- a/lib/pause_2017/templates/user/files/delete.html.ep +++ b/lib/pause_2017/templates/user/files/delete.html.ep @@ -29,14 +29,14 @@ % for my $file (sort keys %$files) { - <%= check_box "pause99_delete_files_FILE" => $file, 'data-distv' => $files->{$file}{distv} %> + <%= check_box "pause99_delete_files_FILE" => $file %> % if ($files->{$file}{indexed}) { <%= $file %> [indexed] % } else { <%= $file %> % } <%= $files->{$file}{stat} %> - <%= $files->{$file}{blurb} %> + <%= $files->{$file}{blurb} %> % } @@ -48,19 +48,8 @@ %= javascript "/list.min.js" %= javascript begin var List = new List('files', { - valueNames: ['file', 'size', { name: 'modified', attr: 'data-modified' }] + valueNames: ['file', 'size', 'modified'] }); - -document.querySelectorAll('input[type=checkbox]').forEach(function(e) { - e.addEventListener('change', function(ev) { - var checked = ev.currentTarget.checked; - var distv = ev.currentTarget.getAttribute('data-distv'); - document.querySelectorAll('input[data-distv="'+distv+'"]').forEach(function(e) { - e.checked = checked; - }); - }) -}); - % end % end diff --git a/lib/pause_2017/templates/user/files/show.html.ep b/lib/pause_2017/templates/user/files/show.html.ep index 950f6414d..9bab21d54 100644 --- a/lib/pause_2017/templates/user/files/show.html.ep +++ b/lib/pause_2017/templates/user/files/show.html.ep @@ -23,7 +23,7 @@ <%= $file %> % } <%= $files->{$file}{stat} %> - <%= $files->{$file}{blurb} %> + <%= $files->{$file}{blurb} %> % } @@ -33,7 +33,7 @@ %= javascript "/list.min.js" %= javascript begin var List = new List('files', { - valueNames: ['file', 'size', { name: 'modified', attr: 'data-modified' }] + valueNames: ['file', 'size', 'modified'] }); % end % end