Merge branch 'master' into newmc

Conflicts:
	lib/Plack/App/Gruntmaster.pm

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 80bcc1a9c130563aacdce3ac9b72aaade7d33d6b..aa473d866c1376d349c722c053329af5a3338232 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -165,7 +165,7 @@ sub dispatch_request{
                },
 
                sub (/ed/:contest) {
-                       forbid contest->is_running;
+                       forbid !contest->is_finished;
                        my $pblist = db->problem_list(contest => $_{contest}, solution => 1);
                        response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial};
                },

diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 319a5e509d70d71b881829a4addeb27fd010bae2..66468ca6a1aa6eabf2b3de81ec10d2ce6777ebef 100644 (file)
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -287,6 +287,6 @@ sub process_ed {
                $div->set_child_content(class => 'solution', literal $data->{solution});
                $div->fclass('problem')->namedlink($data->{id}, $data->{name});
        };
-       my @pb = map { @{$args{$_}} } qw/beginner easy medium hard/;
+       my @pb = map { @{$args{$_} // []} } qw/beginner easy medium hard/;
        $tree->fclass('well')->iter3(\@pb, $iter);
 }