Planet government intel

diff --git a/lib/NDWeb/Controller/Intel.pm b/lib/NDWeb/Controller/Intel.pm
index 9666282e1f805c31fafac2af5784a77866f8f269..a67674714b71fa87f133ba3fe96eb0961ba60077 100644 (file)
--- a/lib/NDWeb/Controller/Intel.pm
+++ b/lib/NDWeb/Controller/Intel.pm
@@ -80,7 +80,9 @@ sub planet : Local {
        $c->forward('/listAlliances');
        $c->forward('/forum/findPosts',[$p->{ftid}]);
 
-       $c->stash(govs => ["","Feu", "Dic", "Dem","Uni"]);
+       my $governments = $dbh->prepare(q{SELECT gov, gov_name FROM governments});
+       $governments->execute;
+       $c->stash(govs => $governments->fetchall_arrayref({}));
        $c->stash(planetstatus => ["","Friendly", "NAP", "Hostile"]);
 
        $query = $dbh->prepare(q{

diff --git a/root/src/intel/planet.tt2 b/root/src/intel/planet.tt2
index 86fbff97005f876802a87d58d8b59110ef394af6..ce4626848705b27f0f14a3f91133e73e5d0fb5ef 100644 (file)
--- a/root/src/intel/planet.tt2
+++ b/root/src/intel/planet.tt2
@@ -21,8 +21,8 @@
                </tr>
                <tr><td>Government</td>
                        <td><select name="gov">
-[% FOR gov IN govs %]
-                               <option value="[% gov %]" [% IF gov == p.gov %]selected[% END %]> [% gov %]</option>
+[% FOR g IN govs %]
+                               <option value="[% g.gov %]" [% IF g.gov == p.gov %]selected[% END %]> [% g.gov_name %]</option>
 [% END %]
                                </select></td>
                        <td><input type="checkbox" name="cgov"></td>