Merge branch 'master' into newmc

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

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 3ec528429124eb4e1c0b85bd1174b29252c91554..ef80f50eb8fa58c36d6f37691a15504ec7d380b1 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -166,7 +166,8 @@ sub dispatch_request{
 
                sub (/ed/:contest) {
                        forbid contest->is_running;
-                       response ed => 'Editorial of ' . contest->name, db->problem_list(contest => $_{contest}, solution => 1);
+                       my $pblist = db->problem_list(contest => $_{contest}, solution => 1);
+                       response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial};
                },
 
                sub (/login) {
@@ -226,7 +227,6 @@ sub dispatch_request{
                        db->users->create({id => $_{username}, name => $_{name}, email => $_{email}, phone => $_{phone}, town => $_{town}, university => $_{university}, country => $_{country}, level => $_{level}});
                        db->user($_{username})->set_passphrase($_{password});
 
-                       purge '/us/';
                        reply 'Registered successfully';
                },
 
@@ -263,7 +263,6 @@ sub dispatch_request{
                                owner => remote_user->id,
                        });
 
-                       purge '/log/';
                        [303, [Location => '/log/' . $newjob->id], []]
                },