From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 25 Mar 2014 11:58:47 +0000 (+0200)
Subject: Merge branch 'master' into gruntmaster
X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=commitdiff_plain;h=bd86f820f0ea665d33aaa6c27ad5bede7d1d1f8c;hp=95f6e82c13f99d51f67dea72e024fafc1e4cd655

Merge branch 'master' into gruntmaster
---

diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm
index 35d89ad..9e07d4c 100644
--- a/lib/Gruntmaster/Page/Generic.pm
+++ b/lib/Gruntmaster/Page/Generic.pm
@@ -123,7 +123,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} };
diff --git a/tmpl/ct.en b/tmpl/ct.en
index 038fef0..9420708 100644
--- a/tmpl/ct.en
+++ b/tmpl/ct.en
@@ -12,13 +12,13 @@
 </table>
 </tmpl_if>
 
-<tmpl_if pstoping>
-<h1>Pstoping contests</h1>
+<tmpl_if pending>
+<h1>Pending contests</h1>
 <table border class="table table-bordered table-striped">
 <thead>
 <tr><th>Name<th>Start date<th>Stop date<th>Owner
 <tbody>
-<tmpl_loop pstoping><tr><td><a href="/ct/<tmpl_var id>"><tmpl_var name></a>
+<tmpl_loop pending><tr><td><a href="/ct/<tmpl_var id>"><tmpl_var name></a>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{start}; %>
 <td><%perl __OUT__ POSIX::strftime '%c', localtime __CURRENT__->{stop};  %>
 <td><a href="/us/<tmpl_var owner>"><tmpl_if owner_name><tmpl_var owner_name><tmpl_else><tmpl_var owner></tmpl_if></a>