Merge branch 'master' into gruntmaster

diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm
index 35d89adab97874619da159b1a8a24ea5023a6b43..9e07d4c8a68814aa11189b8a8f5a30e7d9390864 100644 (file)
--- 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 038fef0197c055f6fdcccd8e09f15c9c40aa4557..9420708957ff66c8215ae2fd20aed42c2f4927c8 100644 (file)
--- 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>