target list more ajax:ish

[ndwebbie.git] / include.pl

diff --git a/include.pl b/include.pl
index ad9fd06e197cd7f6c3b16b50ff311c790016f42d..c5a5acf39417f6d525837f284a0c837eea5a62f2 100644 (file)
--- a/include.pl
+++ b/include.pl
@@ -80,7 +80,7 @@ ORDER BY r.tick+c.wave,x,y,z});
                my $coords = "Target $target->{id}";
                $coords = $target->{coords} if $target->{released_coords};
                push @targets,{Coords => $coords, Launched => $target->{launched}, Raid => $target->{raid}
-                       , Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave}};
+                       , Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave}, AJAX => $ND::AJAX};
        }
        my $template = HTML::Template->new(filename => "templates/targetlist.tmpl");
        $template->param(Targets => \@targets);
@@ -106,10 +106,8 @@ SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i
 FROM (intel i NATURAL JOIN users u)
        JOIN current_planet_stats t ON i.target = t.id
        JOIN current_planet_stats o ON i.sender = o.id
-       LEFT OUTER JOIN alliances ta ON t.alliance_id = ta.id
-       LEFT OUTER JOIN alliances oa ON o.alliance_id = oa.id
 WHERE $where 
-GROUP BY t.x,t.y,t.z,o.x,o.y,o.z,i.mission,i.tick,i.amount,i.ingal,u.username,ta.name,oa.name 
+GROUP BY i.tick,i.mission,t.x,t.y,t.z,o.x,o.y,o.z,i.amount,i.ingal,u.username,t.alliance,o.alliance,t.nick,o.nick
 ORDER BY i.tick DESC, i.mission};
 }