Redirect to new job instead of job log on submit

[gruntmaster-page.git] / lib / Plack / App / Gruntmaster.pm

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index da00862dfa48a6579aa092687c2785769f877757..a809e4669863bc3d77bf4b17cfec39fd9680650e 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -152,8 +152,14 @@ sub dispatch_request{
 
                sub (/us/)                                        { response us => 'Users', {us => db->user_list} },
                sub (/ct/  + ?:owner~)                            { response ct => 'Contests', db->contest_list(%_) },
-               sub (/log/ + ?:contest~&:owner~&:page~&:problem~) { response log => 'Job list', {%{db->job_list(%_)}, maybe contest => $_{contest}} },
-               sub (/pb/  + ?:owner~&:contest~)                  { response pb => 'Problems', {%{db->problem_list(%_)}, maybe contest => $_{contest}} },
+               sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~) {
+                       forbid $_{private};
+                       response log => 'Job list', {%{db->job_list(%_)}, maybe contest => $_{contest}}
+               },
+               sub (/pb/  + ?:owner~&:contest~&:private~)                  {
+                       forbid $_{private};
+                       response pb => 'Problems', {%{db->problem_list(%_)}, maybe contest => $_{contest}}
+               },
 
                sub (/us/:user)    { response us_entry => user->name, db->user_entry($_{user}) },
                sub (/ct/:contest) { response ct_entry => contest->name, db->contest_entry($_{contest}) },
@@ -210,7 +216,7 @@ sub dispatch_request{
 
                        my $source = $prog ? read_file $prog->path : $_{source_code};
                        unlink $prog->path if $prog;
-                       db->jobs->create({
+                       my $newjob = db->jobs->create({
                                maybe contest => $_{contest},
                                maybe private => problem->private,
                                date => time,
@@ -222,7 +228,7 @@ sub dispatch_request{
                        });
 
                        purge '/log/';
-                       redirect $_{contest} ? "/log/?contest=$_{contest}" : '/log/';
+                       [303, [Location => '/log/' . $newjob->id], []]
                }
        }
 }