From: Marius Gavrilescu Date: Sat, 21 Mar 2015 11:36:35 +0000 (+0200) Subject: Simplify calls to process_pb_entry and process_log X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=7e158d3c2f023119628265310fdb8f85d9b1c29e;hp=54bc2c5c0fbc6bb19d46c9c638abf4ac727cebb1;p=gruntmaster-page.git Simplify calls to process_pb_entry and process_log --- diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm index f401e3f..9284acc 100644 --- a/lib/Plack/App/Gruntmaster.pm +++ b/lib/Plack/App/Gruntmaster.pm @@ -149,7 +149,7 @@ sub dispatch_request{ sub (/ct/ + ?:owner~) { response ct => 'Contests', db->contest_list(%_), 300 }, sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~&:result~) { forbid $_{private}; - response log => 'Job list', {%{db->job_list(%_)}, maybe contest => $_{contest},}, 5 + response log => 'Job list', db->job_list(%_), 5 }, sub (/pb/ + ?:owner~&:contest~&:private~) { forbid $_{private}; @@ -173,7 +173,7 @@ sub dispatch_request{ forbid !remote_user; $privacy = 'private'; } - response pb_entry => problem->name, {%{db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id)}, maybe contest => $_{contest}}, $_{contest} ? 10 : (); + response pb_entry => problem->name, db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id), $_{contest} ? 10 : (); }, sub (/sol/:problem) { forbid problem->private; diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm index 57b4e50..1e0f788 100644 --- a/lib/Plack/App/Gruntmaster/HTML.pm +++ b/lib/Plack/App/Gruntmaster/HTML.pm @@ -171,8 +171,8 @@ sub process_pb_entry { $tree->fid('nosubmit')->detach; $tree->look_down(name => 'problem')->attr(value => $args{id}); my $contest = $tree->look_down(name => 'contest'); - $contest->attr(value => $args{contest}) if $args{contest}; - $contest->detach unless $args{contest} + $contest->attr(value => $args{args}{contest}) if $args{args}{contest}; + $contest->detach unless $args{args}{contest} } else { $tree->fid('nosubmit')->find('a')->edit_href(sub{s/id/$args{id}/}); $tree->fid('submit')->detach @@ -236,7 +236,7 @@ sub process_log { my ($data, $tr) = @_; $tr->fclass('id')->namedlink($data->{id}); $tr->fclass('problem')->namedlink($data->{problem}, $data->{problem_name}); - $tr->fclass('problem')->find('a')->edit_href(sub{$_ .= "?contest=$args{contest}"}) if $args{contest}; + $tr->fclass('problem')->find('a')->edit_href(sub{$_ .= "?contest=$args{args}{contest}"}) if $args{args}{contest}; $tr->fclass('contest')->namedlink($data->{contest}, $data->{contest_name}) if $data->{contest}; $tr->fclass('contest')->replace_content('None') unless $data->{contest}; $tr->fclass('date')->replace_content(ftime $data->{date});