X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=547eaba544297c8ea7d49947558e9c90ee8a2b5d;hp=2d7b23831f29cb08420ae5d04f90dc1b9d07279c;hb=dfc0018254d6a5e5aed4986ae317cff6a5a89b78;hpb=491e82eb192b76e7e8eece5aaf43b7aebb81a12d

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 2d7b238..547eaba 100644
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -21,14 +21,14 @@ sub calc_score{
 }
 
 sub _generate{
-	my ($self, $htc, $lang, $env, $ct) = @_;
-	debug $env => "language is '$lang' and contest is '$ct'";
+	my ($self, $htc, $lang, $env) = @_;
+	#debug $env => "language is '$lang'";
 
-	$ct &&= db($env)->contest($ct);
+	my $ct = $env->{'gruntmaster.contest'} && db($env)->contest($env->{'gruntmaster.contest'});
 
-	my @problems = map { $_->problem } db($env)->contest_problems->search({contest => $ct->id}, {qw/join problem order_by problem.level/});
+	my @problems = map { $_->problem } db($env)->contest_problems->search({contest => $ct && $ct->id}, {qw/join problem order_by problem.level/});
 	my (%scores, %tries);
-	for my $job (db($env)->jobs->search({contest => $ct->id})) {
+	for my $job (db($env)->jobs->search({contest => $ct && $ct->id})) {
 
 		if ($ct) {
 			my $time = $job->date - $ct->start;
@@ -42,7 +42,7 @@ sub _generate{
 		}
 	}
 
-	my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user}} map {
+	my @st = sort { $b->{score} <=> $a->{score} or $a->{user}->id cmp $b->{user}->id} map {
 		my $user = $_;
 		+{
 			user => db($env)->user($user),