diff options
| author | jhunkeler <jhunkeler@c5b2fb0a-d05d-0410-98c8-828840a80ff6> | 2011-04-17 12:49:09 -0400 |
|---|---|---|
| committer | jhunkeler <jhunkeler@c5b2fb0a-d05d-0410-98c8-828840a80ff6> | 2011-04-17 12:49:09 -0400 |
| commit | fa8180ea3a41584943dd7464eb8c3cad769d8211 (patch) | |
| tree | 9d52ffcd157d29f322226b467d7fe70eaa502388 /modules/rudi | |
| parent | b3261cbea8c20989d2976a4816021438a668397d (diff) | |
| download | bayonetcms-fa8180ea3a41584943dd7464eb8c3cad769d8211.tar.gz | |
Jessus christ
git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2.1@491 c5b2fb0a-d05d-0410-98c8-828840a80ff6
Diffstat (limited to 'modules/rudi')
| -rw-r--r-- | modules/rudi/includes/common.class.php | 4 | ||||
| -rw-r--r-- | modules/rudi/views/view.roster.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/rudi/includes/common.class.php b/modules/rudi/includes/common.class.php index 2e64e48..2112853 100644 --- a/modules/rudi/includes/common.class.php +++ b/modules/rudi/includes/common.class.php @@ -708,10 +708,10 @@ class RUDI_Common * @param int $unit_id */ public function displayUnitsRec($unit_id){ - $result = $this->db->Query("SELECT * FROM `rudi_combat_units` WHERE `detachment` = '$unit_id'"); + $result = $this->db->Query("SELECT * FROM `rudi_combat_units` WHERE `detachment` = '$unit_id' ORDER BY `weight`"); $row = $this->db->FetchObject($result,'UnitInfo'); foreach($row as $unit){ - echo "<tr><th colspan=\"5\">{$unit->name}</th></tr>"; + echo "<tr><th colspan=\"5\">{$unit->name} : {$unit->callsign}</th></tr>"; $this->printRoster($unit->unit_id, $unit->leader_id); $this->displayUnitsRec($unit->unit_id); } diff --git a/modules/rudi/views/view.roster.php b/modules/rudi/views/view.roster.php index 01da5ea..c0ee92d 100644 --- a/modules/rudi/views/view.roster.php +++ b/modules/rudi/views/view.roster.php @@ -3,7 +3,7 @@ $result = $this->db->query("SELECT * FROM `rudi_combat_units` WHERE `detachment` = 0");
$row = $this->db->fetch($result);
foreach($row as $unit){
- echo "<tr><th colspan=\"5\">{$unit['name']}</th></tr>";
+ echo "<tr><th colspan=\"5\">{$unit['name']} : {$unit['callsign']}</th></tr>";
?>
<tr>
<!-- Table header -->
|