Import some changes from the mindcoding branch

[gruntmaster-page.git] / lib / Gruntmaster / Page / Generic.pm

diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm
index 9e07d4c8a68814aa11189b8a8f5a30e7d9390864..15b887ea03c64d778fbf38738c3c5857d75603cf 100644 (file)
--- a/lib/Gruntmaster/Page/Generic.pm
+++ b/lib/Gruntmaster/Page/Generic.pm
@@ -38,6 +38,8 @@ sub list {
        $rs = $rs->search(undef, {order_by => 'me.id'}) unless $rs->is_ordered;
        if (my $page = $env->{'gruntmaster.page'}) {
                my $pages = int ($rs->count / PAGE_SIZE);
+               $params{default_page} = $page == -1;
+               $pages = 1 if $pages < 1;
                $page = $pages if $page == -1;
                @params{'page', 'pages'} = ($page, $pages);
                $rs = $rs->search(undef, {offset => ($page - 1) * PAGE_SIZE, ($page == $pages ? () : (rows => PAGE_SIZE))});
@@ -47,7 +49,7 @@ sub list {
                exists $thing{columns} ? (columns => $thing{columns}) : (),
        });
        my @thing = map +{rs => $_, $_->get_columns}, $rs->all;
-       @thing = map  { $thing{mangle}->(); $_ } @thing if exists $thing{mangle};
+       @thing = map  { $thing{mangle}->($env); $_ } @thing if exists $thing{mangle};
        @thing = grep { $thing{choose}->() } @thing if exists $thing{choose};
        @thing = sort { $thing{sortby}->() } @thing if exists $thing{sortby};
        $thing{group} //= sub { $thing{id} };
@@ -64,7 +66,8 @@ sub entry {
        my %thing = %$thing;
        debug $env => "Rsname is $thing{rsname} and id is $id";
        my %params = map {+ rs => $_, $_->get_columns } db($env)->resultset($thing{rsname})->find($id);
-       $thing{mangle}->(local $_ = \%params) if exists $thing{mangle};
+       local $_ = \%params;
+       $thing{mangle}->($env) if exists $thing{mangle};
        wantarray ? %params : \%params
 }
 
@@ -132,10 +135,11 @@ thing {
                $_->{owner_name} = $_->{rs}->owner->name;
                $_->{cansubmit} = $env->{'gruntmaster.contest'} ? time < db($env)->contest($env->{'gruntmaster.contest'})->stop : 1;
                eval {
-                       db($env)->open->create({
+                       db($env)->opens->create({
                                contest => $env->{'gruntmaster.contest'},
                                problem => $_->{id},
                                owner   => $env->{REMOTE_USER},
+                               time    => time,
                        })
                } if $env->{'gruntmaster.contest'} && time >= db($env)->contest($env->{'gruntmaster.contest'})->start;
        };
@@ -161,6 +165,7 @@ thing {
        };
        sortby { $b->{id} <=> $a->{id}};
        mangle {
+               my $env = shift;
                $_->{results} &&= decode_json $_->{results};
                $_->{owner_name} = $_->{rs}->owner->name;
                $_->{problem_name} = $_->{rs}->problem->name;
@@ -171,5 +176,6 @@ thing {
 
 putsym 'Gruntmaster::Page::Pb::Entry::vary',    sub { 'Authorization' };
 putsym 'Gruntmaster::Page::Pb::Entry::max_age', sub { 600 };
+putsym 'Gruntmaster::Page::Log::max_age', sub { 10 };
 
 1