Fix keys on reference is experimental warning

[plack-app-gruntmaster.git] / lib / Plack / App / Gruntmaster / HTML.pm

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 40d46affa440dd7ebc5653ab4cd26670b91739a6..dc74d87dd2b952a9a4f8ae2da91152e434dce368 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -156,10 +156,10 @@ sub process_pb_entry {
                $tree->fid('score')->attr('data-value' => $args{value});
                $tree->fid('score')->replace_content(Gruntmaster::Data::Result::Contest::calc_score($args{value}, $args{time} - $args{open_time}, 0, $args{contest_stop} - $args{contest_start}));
        } else {
+               $tree->fid('solution')->detach unless $args{solution};
                $_->detach for $tree->fclass('rc'); # requires contest
                $tree->fid('solution_modal')->fclass('modal-body')->replace_content(literal $args{solution});
        }
-       $tree->fid('solution')->detach unless $args{solution};
        if ($args{cansubmit}) {
                $tree->look_down(name => 'problem')->attr(value => $args{id});
                my $contest = $tree->look_down(name => 'contest');
@@ -234,6 +234,13 @@ sub process_log {
        $tree->find('table')->find('tbody')->find('tr')->iter3($args{log}, $iter);
        $args{next_page} ? $tree->fclass('next')->namedlink($args{next_page}, 'Next') : $tree->fclass('next')->detach;
        $args{previous_page} ? $tree->fclass('previous')->namedlink($args{previous_page}, 'Previous') : $tree->fclass('previous')->detach;
+       for my $cls (qw/next previous/) {
+               my $elem = $tree->fclass($cls);
+               next unless $elem;
+               delete $args{args}{page};
+               my $str = join '&', map { $_ . '=' . $args{args}{$_} } keys %{$args{args}};
+               $elem->find('a')->edit_href(sub{s/$/&$str/});
+       }
        $tree->fclass('current')->replace_content("Page $args{current_page} of $args{last_page}");
 }
 
@@ -243,7 +250,7 @@ sub process_st {
        my $pbiter = sub {
                my ($data, $th) = @_;
                $th->attr(class => undef);
-               $th->namedlink($data->id, $data->name);
+               $th->namedlink(@$data);
        };
        $tree->fclass('problem')->iter3($args{problems}, $pbiter);
        my $iter = sub {