From 53198ec1003d3f3dc0388af28c1192f0d877ad3c Mon Sep 17 00:00:00 2001
From: "liukmqd@gmail.com" <liukmqd@gmail.com>
Date: Wed, 4 May 2011 08:20:35 +0000
Subject: [PATCH] * Fixed a bug of the wrong user name in company dynamic and
 user dynamic, and corrected 'Test Case' to 'Test case';

---
 module/company/control.php           |  2 +-
 module/company/view/dynamic.html.php |  2 +-
 module/my/lang/en.php                |  2 +-
 module/user/control.php              |  2 +-
 module/user/view/dynamic.html.php    | 13 ++++++-------
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/module/company/control.php b/module/company/control.php
index 982ee53eb0..956370bebb 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -179,7 +179,7 @@ class company extends control
 
         /* Assign. */
         $this->view->type    = $type;
-        $this->view->users   = $this->loadModel('user')->getPairs('nodeleted|noclosed');
+        $this->view->users   = $this->loadModel('user')->getPairs('nodeleted|noletter');
         $this->view->account = $account;
         $this->view->actions = $this->loadModel('action')->getDynamic($account, $period, $orderBy, $pager);
         $this->display();
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index e974c7834d..bbb7d771b1 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -42,7 +42,7 @@
   <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
   <tr class='a-center'>
     <td><?php echo $action->date;?></td>
-    <td><?php echo $app->user->realname;?></td>
+    <td><?php isset($users[$action->actor]) ? print($users[$action->actor]) : print($action->actor);?></td>
     <td><?php echo $action->actionLabel;?></td>
     <td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
     <td><?php echo $action->objectID;?></td>
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 0548c5570d..ff6594eb58 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -7,7 +7,7 @@ $lang->my->todo        = 'Todo';
 $lang->my->task        = 'Task';
 $lang->my->bug         = 'Bug';
 $lang->my->testTask    = 'Test task';
-$lang->my->testCase    = 'Test Case';
+$lang->my->testCase    = 'Test case';
 $lang->my->story       = 'Story';
 $lang->my->project     = 'Project';
 $lang->my->team        = 'Team';
diff --git a/module/user/control.php b/module/user/control.php
index 188e80e175..f6a67e466f 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -477,7 +477,7 @@ class user extends control
 
         /* Assign. */
         $this->view->period  = $period;
-        $this->view->users   = $this->loadModel('user')->getPairs('nodeleted|noclosed');
+        $this->view->users   = $this->loadModel('user')->getPairs('nodeleted|noletter');
         $this->view->account = $account;
         $this->view->actions = $this->loadModel('action')->getDynamic($account, $period, $orderBy, $pager);
         $this->display();
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index cf941c84ed..53cb28ed7b 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -26,14 +26,13 @@
 </div>
 
 <table class='table-1 colored tablesorter'>
-  <?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
   <thead>
   <tr class='colhead'>
-    <th class='w-150px'><?php common::printOrderLink('date',       $orderBy, $vars, $lang->action->date);?></th>
-    <th class='w-user'> <?php common::printOrderLink('actor',      $orderBy, $vars, $lang->action->actor);?></th>
-    <th class='w-100px'><?php common::printOrderLink('action',     $orderBy, $vars, $lang->action->action);?></th>
-    <th class='w-80px'> <?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
-    <th class='w-id'>   <?php common::printOrderLink('objectID',   $orderBy, $vars, $lang->idAB);?></th>
+    <th class='w-150px'><?php echo $lang->action->date;?></th>
+    <th class='w-user'> <?php echo $lang->action->actor;?></th>
+    <th class='w-100px'><?php echo $lang->action->action;?></th>
+    <th class='w-80px'> <?php echo $lang->action->objectType;?></th>
+    <th class='w-id'>   <?php echo $lang->idAB;?></th>
     <th><?php echo $lang->action->objectName;?></th>
   </tr>
   </thead>
@@ -42,7 +41,7 @@
   <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
   <tr class='a-center'>
     <td><?php echo $action->date;?></td>
-    <td><?php echo $app->user->realname;?></td>
+    <td><?php echo $users[$action->actor];?></td>
     <td><?php echo $action->actionLabel;?></td>
     <td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
     <td><?php echo $action->objectID;?></td>