Use new race infrastructure for members stats

[ndwebbie.git] / lib / NDWeb / Controller / Members.pm

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index fb0e6e41d309b425c15ba0004919341e26e27f43..52bcb4c0f2a251304b6e7da4cebfb7e16e9b092e 100644 (file)
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -246,7 +246,7 @@ sub stats : Local {
        my $limit = 'LIMIT 10';
        $limit = '' if $c->check_user_roles(qw/members_points_nolimit/);
 
-       my ($races) = $dbh->selectrow_array(q{SELECT enum_range(null::race)::text[]});
+       my ($races) = $dbh->selectrow_array(q{SELECT array_agg(race ORDER BY race_id) FROM races WHERE race_id >= 0});
        $c->stash(races => $races);
        my $query = $dbh->prepare(q{
 SELECT nick
@@ -725,7 +725,7 @@ sub member_fleets {
                ,NULL AS recalled, mission
        FROM fleets f
        WHERE pid = $2 AND tick <= tick() AND tick >= tick() -  24
-               AND name IN ('Main','Advanced Unit') AND mission = 'Full fleet'
+               AND name IN ('Main', 'Advanced Unit', 'Military') AND mission = 'Full fleet'
        ORDER BY mission,name,tick DESC, fid DESC
 ) UNION (
        SELECT fid,name,landing_tick AS tick, eta, amount