Make problem_list return solutions if requested (for editorial support)

[gruntmaster-data.git] / lib / Gruntmaster / Data.pm

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 296549b8a3d6c4ce61981cff8dba3a0e7d7c498d..16a6176fcf65e6b0cf8c5c5d41590d5e6bdb6c7e 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -26,7 +26,7 @@ use PerlX::Maybe qw/maybe/;
 use Sub::Name qw/subname/;
 
 use constant PROBLEM_PUBLIC_COLUMNS => [qw/id author writer level name owner private timeout olimit value/];
-use constant USER_PUBLIC_COLUMNS => [qw/id admin name town university level/];
+use constant USER_PUBLIC_COLUMNS => [qw/id admin name town university country level/];
 use constant JOBS_PER_PAGE => 10;
 
 sub dynsub{
@@ -74,7 +74,9 @@ sub user_entry {
 
 sub problem_list {
        my ($self, %args) = @_;
-       my $rs = $self->problems->search(undef, {order_by => 'me.name', columns => PROBLEM_PUBLIC_COLUMNS, prefetch => 'owner'});
+       my @columns = @{PROBLEM_PUBLIC_COLUMNS()};
+       push @columns, 'solution' if $args{solution} && $args{contest} && !$self->contest($args{contest})->is_running;
+       my $rs = $self->problems->search(undef, {order_by => 'me.name', columns => \@columns, prefetch => 'owner'});
        $rs = $rs->search({-or => ['contest_problems.contest' => undef, 'contest.stop' => {'<=', time}], 'me.private' => 0}, {join => {'contest_problems' => 'contest'}, distinct => 1}) unless $args{contest} || $args{private};
        $rs = $rs->search({'contest_problems.contest' => $args{contest}}, {join => 'contest_problems'}) if $args{contest};
        $rs = $rs->search({'me.owner' => $args{owner}}) if $args{owner};
@@ -90,10 +92,10 @@ sub problem_list {
 sub problem_entry {
        my ($self, $id, $contest, $user) = @_;
        my $running = $contest && $self->contest($contest)->is_running;
-       my $columns = PROBLEM_PUBLIC_COLUMNS;
-       push @$columns, 'statement';
-       push @$columns, 'solution' unless $running;
-       my $pb = $self->problems->find($id, {columns => $columns, prefetch => 'owner'});
+       my @columns = @{PROBLEM_PUBLIC_COLUMNS()};
+       push @columns, 'statement';
+       push @columns, 'solution' unless $running;
+       my $pb = $self->problems->find($id, {columns => \@columns, prefetch => 'owner'});
        my $open;
        $open = $self->opens->find_or_create({
                contest => $contest,