diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index c7d5a05ff3..980aae4005 100644 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -133,7 +133,7 @@ $lang->action->label->testtask = '测试任务|testtask|view|caseID=%s'; $lang->action->label->todo = 'todo|todo|view|todoID=%s'; $lang->action->label->doclib = '文档库|doc|browse|libID=%s'; $lang->action->label->doc = '文档|doc|view|docID=%s'; -$lang->action->label->user = '用户'; +$lang->action->label->user = '用户|user|view|account=%s'; $lang->action->label->space = ' '; /* Object type. */ diff --git a/module/action/model.php b/module/action/model.php index 011841f298..6090db85e4 100644 --- a/module/action/model.php +++ b/module/action/model.php @@ -510,13 +510,7 @@ class actionModel extends model $action->objectLabel = isset($this->lang->action->label->$objectType) ? $this->lang->action->label->$objectType : $objectType; /* If action type is login or logout, needn't link. */ - if($actionType == 'login' or $actionType == 'logout') - { - $action->objectLink = ''; - $action->objectLabel = ''; - continue; - } - elseif($actionType == 'svncommited') + if($actionType == 'svncommited') { $action->actor = isset($commiters[$action->actor]) ? $commiters[$action->actor] : $action->actor; }