From 667427e9b74942392e0335323d6a0ab777c70090 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Wed, 13 Jan 2010 09:57:49 +0000 Subject: [PATCH] * convert account to realname. --- trunk/module/index/control.php | 1 + trunk/module/index/view/index.html.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/trunk/module/index/control.php b/trunk/module/index/control.php index 85dfa9cd15..c9cbae950d 100644 --- a/trunk/module/index/control.php +++ b/trunk/module/index/control.php @@ -51,6 +51,7 @@ class index extends control $this->view->burns = $burns; $this->view->counts = count($projects); $this->view->actions = $this->dao->select('*')->from(TABLE_ACTION)->orderBy('id desc')->limit(30)->fetchAll(); + $this->view->users = $this->loadModel('user')->getPairs($this->app->company->id, 'noletter'); $this->display(); } diff --git a/trunk/module/index/view/index.html.php b/trunk/module/index/view/index.html.php index 0b6461f5d0..68eabf8ebb 100644 --- a/trunk/module/index/view/index.html.php +++ b/trunk/module/index/view/index.html.php @@ -59,7 +59,7 @@ foreach($actions as $action) { if($action->objectType == 'case') $action->objectType = 'testcase'; - echo date('H:i', $action->date) . ' ' . $action->actor . ' ' . $action->action . ' ' . $action->objectType . ' ' . html::a($this->createLink($action->objectType, 'view', "id=$action->objectID"), '#' . $action->objectID); + echo date('H:i', $action->date) . ' ' . $users[$action->actor] . ' ' . $action->action . ' ' . $action->objectType . ' ' . html::a($this->createLink($action->objectType, 'view', "id=$action->objectID"), '#' . $action->objectID); echo "
"; } ?>