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 @@
objectType == 'case' ? 'testcase' : $action->objectType;?>
| date;?> |
- user->realname;?> |
+ actor]) ? print($users[$action->actor]) : print($action->actor);?> |
actionLabel;?> |
action->objectTypes[$action->objectType];?> |
objectID;?> |
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 @@
- recTotal}&recPerPage={$pager->recPerPage}"; ?>
- | action->date);?> |
- action->actor);?> |
- action->action);?> |
- action->objectType);?> |
- idAB);?> |
+ action->date;?> |
+ action->actor;?> |
+ action->action;?> |
+ action->objectType;?> |
+ idAB;?> |
action->objectName;?> |
@@ -42,7 +41,7 @@
objectType == 'case' ? 'testcase' : $action->objectType;?>
| date;?> |
- user->realname;?> |
+ actor];?> |
actionLabel;?> |
action->objectTypes[$action->objectType];?> |
objectID;?> |