X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FGeneric.pm;h=15b887ea03c64d778fbf38738c3c5857d75603cf;hb=600e4c01f0fc265a61aea2830c26ed2bd6d77c73;hp=9c5687b2b705ab77622da9217b453e9df41f1e05;hpb=58a0ba09590653e5afceb39431f7fa893d26c86f;p=gruntmaster-page.git

diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm
index 9c5687b..15b887e 100644
--- a/lib/Gruntmaster/Page/Generic.pm
+++ b/lib/Gruntmaster/Page/Generic.pm
@@ -38,13 +38,18 @@ 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))});
 	}
-	$rs = $rs->search(undef, {prefetch => $thing{prefetch}}) if exists $thing{prefetch};
+	$rs = $rs->search(undef, {
+		exists $thing{prefetch} ? (prefetch => $thing{prefetch}) : (),
+		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} };
@@ -60,9 +65,9 @@ sub entry {
 	my ($thing, $lang, $env, $id) = @_;
 	my %thing = %$thing;
 	debug $env => "Rsname is $thing{rsname} and id is $id";
-	$thing{makers} //= sub { db(shift)->resultset($thing{rsname}) };
-	my %params = map {+ rs => $_, $_->get_columns } $thing{makers}->($env)->find($id);
-	$thing{mangle}->(local $_ = \%params) if exists $thing{mangle};
+	my %params = map {+ rs => $_, $_->get_columns } db($env)->resultset($thing{rsname})->find($id);
+	local $_ = \%params;
+	$thing{mangle}->($env) if exists $thing{mangle};
 	wantarray ? %params : \%params
 }
 
@@ -86,6 +91,7 @@ sub sortby (&);
 sub group  (&);
 sub mangle (&);
 sub prefetch;
+sub columns;
 
 sub thing (&){
 	my %thing;
@@ -97,6 +103,7 @@ sub thing (&){
 	local *{"group"} = sub { $thing{group} = shift };
 	local *{"makers"} = sub { $thing{makers} = shift };
 	local *{"prefetch"} = sub { $thing{prefetch} = \@_ };
+	local *{"columns"} = sub { $thing{columns} = \@_ };
 	use strict 'refs';
 
 	shift->();
@@ -119,7 +126,7 @@ thing {
 		my $db = db $env;
 		return $db->problems->search({owner => $env->{'gruntmaster.user'}}) if exists $env->{'gruntmaster.user'};
 		return $db->problems->search({'contest_problems.contest' => $env->{'gruntmaster.contest'}}, {join => 'contest_problems'}) if exists $env->{'gruntmaster.contest'};
-		$db->problems->search({-or => ['contest_problems.contest' => undef, 'contest.stop' => {'<=', time}], 'me.private' => 0}, {join => {'contest_problems' => 'contest'}});
+		$db->problems->search({-or => ['contest_problems.contest' => undef, 'contest.stop' => {'<=', time}], 'me.private' => 0}, {join => {'contest_problems' => 'contest'}, distinct => 1});
 	};
 	sortby { $a->{name} cmp $b->{name}};
 	group { $_->{level} };
@@ -128,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;
 	};
@@ -157,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;
@@ -167,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