Skip to content

Revert changes done for show_files/delete_files at PTS 2025 #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andk merged 4 commits into from
May 13, 2025
Merged

Revert changes done for show_files/delete_files at PTS 2025 #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36cf2ad
Revert "Improve sorting by the modified date for show_files and delet…
charsbar May 13, 2025
2e2ef28
Revert "Use distvname instead of dist not to check distributions with…
charsbar May 13, 2025
c190320
Revert "Add js snippet to check related checkboxes"
charsbar May 13, 2025
14e087c
Revert "Add distibution name to checkboxes to delete"
charsbar May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions lib/pause_2017/PAUSE/Web/Controller/User/Files.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down
17 changes: 3 additions & 14 deletions lib/pause_2017/templates/user/files/delete.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
<tbody class="list">
% for my $file (sort keys %$files) {
<tr>
<td class="checkbox"><%= check_box "pause99_delete_files_FILE" => $file, 'data-distv' => $files->{$file}{distv} %></td>
<td class="checkbox"><%= check_box "pause99_delete_files_FILE" => $file %></td>
% if ($files->{$file}{indexed}) {
<td class="file indexed"><%= $file %> [indexed]</td>
% } else {
<td class="file"><%= $file %></td>
% }
<td class="size"><%= $files->{$file}{stat} %></td>
<td class="modified" data-modified="<%= $files->{$file}{modified} %>"><%= $files->{$file}{blurb} %></td>
<td class="modified"><%= $files->{$file}{blurb} %></td>
</tr>
% }
</tbody>
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions lib/pause_2017/templates/user/files/show.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<td class="file"><%= $file %></td>
% }
<td class="size"><%= $files->{$file}{stat} %></td>
<td class="modified" data-modified="<%= $files->{$file}{modified} %>"><%= $files->{$file}{blurb} %></td>
<td class="modified"><%= $files->{$file}{blurb} %></td>
</tr>
% }
</tbody>
Expand All @@ -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
Expand Down