Merge branch 'master' into newmc

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index bd11fe04e33c429dd3ef7ed8cc7342ddd5cead95..45cdfd1c5107e7babaad66a51a1f0a4885a5d406 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -113,7 +113,8 @@ sub dispatch_request{
 
                sub (/src/:job) {
                        return NOT_FOUND if !job;
-                       forbid job->private || job->problem->private || job->contest && job->contest->is_running;
+                       my $isowner = remote_user && remote_user->id eq job->rawowner;
+                       forbid !$isowner && (job->private || job->problem->private || job->contest && job->contest->is_running);
                        my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => CONTENT_TYPES->{job->format});
                        [200, \@headers, [job->source]]
                },

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 87dc8b48837fa23dddbad6c30e0a3fe336596284..8e36af534b5b3b11af75619472d3a57b4f612542 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -255,6 +255,7 @@ sub process_st {
                my ($data, $th) = @_;
                $th->attr(class => undef);
                $th->namedlink(@$data);
+               $th->find('a')->edit_href(sub{s/$/?contest=$args{args}{contest}/});
        };
        $tree->fclass('problem')->iter3($args{problems}, $pbiter);
        my $iter = sub {