X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FGeneric.pm;h=36ca445a98c00c26ee4cae0b3b5190936d56d75d;hb=a46fb222e6ce50102b7c61a95af435afc74f5e33;hp=fe9525dc44a1feb392f30f290adcdd9450d0896f;hpb=8e0d50d43afb77675f39bb30a4355048e6aae57e;p=gruntmaster-page.git

diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm
index fe9525d..36ca445 100644
--- a/lib/Gruntmaster/Page/Generic.pm
+++ b/lib/Gruntmaster/Page/Generic.pm
@@ -31,21 +31,25 @@ sub makepkg {
 sub list {
 	my ($thing, $lang, $env) = @_;
 	my %thing = %$thing;
+	my %params;
 	#debug $env => "Contest is $ct";
 	$thing{makers} //= sub { db(shift)->resultset($thing{rsname}) };
 	my $rs = $thing{makers}->($env);
 	$rs = $rs->search(undef, {order_by => 'me.id'}) unless $rs->is_ordered;
 	if (my $page = $env->{'gruntmaster.page'}) {
-		my $pages = $rs->count / PAGE_SIZE;
+		my $pages = int ($rs->count / PAGE_SIZE);
 		$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 = grep { $thing{choose}->() } @thing if exists $thing{choose};
 	@thing = sort { $thing{sortby}->() } @thing if exists $thing{sortby};
-	my %params;
 	$thing{group} //= sub { $thing{id} };
 	for (@thing) {
 		my $group = $thing{group}->();
@@ -85,6 +89,7 @@ sub sortby (&);
 sub group  (&);
 sub mangle (&);
 sub prefetch;
+sub columns;
 
 sub thing (&){
 	my %thing;
@@ -96,6 +101,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->();
@@ -116,23 +122,23 @@ thing {
 	makers {
 		my $env = $_[0];
 		my $db = db $env;
-		return $db->contest($env->{'gruntmaster.contest'})->problems->search(undef, {order_by => 'problem.id'}) if exists $env->{'gruntmaster.contest'};
 		return $db->problems->search({owner => $env->{'gruntmaster.user'}}) if exists $env->{'gruntmaster.user'};
-		$db->problems->search({private => 0});
+		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'}});
 	};
 	sortby { $a->{name} cmp $b->{name}};
 	group { $_->{level} };
 	mangle {
 		my $env = shift;
 		$_->{owner_name} = $_->{rs}->owner->name;
-		$_->{cansubmit} = $_->{contest} ? time < $_->{rs}->contest->stop : 1;
+		$_->{cansubmit} = $env->{'gruntmaster.contest'} ? time < db($env)->contest($env->{'gruntmaster.contest'})->stop : 1;
 		eval {
 			db($env)->open->create({
-				contest => $_->{contest},
+				contest => $env->{'gruntmaster.contest'},
 				problem => $_->{id},
 				owner   => $env->{REMOTE_USER},
 			})
-		} if $_->{contest} && time >= $_->{rs}->contest->start;
+		} if $env->{'gruntmaster.contest'} && time >= db($env)->contest($env->{'gruntmaster.contest'})->start;
 	};
 };