diff --git a/module/action/config.php b/module/action/config.php index 18b5fde33b..1c09cebd45 100644 --- a/module/action/config.php +++ b/module/action/config.php @@ -1,5 +1,4 @@ action->objectTables['company'] = TABLE_COMPANY; $config->action->objectTables['product'] = TABLE_PRODUCT; $config->action->objectTables['story'] = TABLE_STORY; $config->action->objectTables['productplan'] = TABLE_PRODUCTPLAN; @@ -10,8 +9,8 @@ $config->action->objectTables['build'] = TABLE_BUILD; $config->action->objectTables['bug'] = TABLE_BUG; $config->action->objectTables['case'] = TABLE_CASE; $config->action->objectTables['testtask'] = TABLE_TESTTASK; +$config->action->objectTables['user'] = TABLE_USER; -$config->action->objectNameFields['company'] = 'name'; $config->action->objectNameFields['product'] = 'name'; $config->action->objectNameFields['story'] = 'title'; $config->action->objectNameFields['productplan'] = 'title'; @@ -22,3 +21,4 @@ $config->action->objectNameFields['build'] = 'name'; $config->action->objectNameFields['bug'] = 'title'; $config->action->objectNameFields['case'] = 'title'; $config->action->objectNameFields['testtask'] = 'name'; +$config->action->objectNameFields['user'] = 'account'; diff --git a/module/action/control.php b/module/action/control.php index faadf5d381..97126178e6 100644 --- a/module/action/control.php +++ b/module/action/control.php @@ -48,6 +48,7 @@ class action extends control $pager = pager::init($recTotal, $recPerPage, $pageID); $this->view->trashes = $this->action->getTrashes($orderBy, $pager); $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->users['system'] = 'system'; $this->view->orderBy = $orderBy; $this->view->pager = $pager; $this->display(); diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index fab2a0f9bc..d709b1ee30 100644 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -31,7 +31,6 @@ $lang->action->objectName = '对象名称'; $lang->action->actor = '操作者'; $lang->action->date = '日期'; -$lang->action->objectTypes['company'] = '公司'; $lang->action->objectTypes['product'] = '产品'; $lang->action->objectTypes['story'] = '需求'; $lang->action->objectTypes['productplan'] = '产品计划'; @@ -42,6 +41,7 @@ $lang->action->objectTypes['build'] = 'Build'; $lang->action->objectTypes['bug'] = 'Bug'; $lang->action->objectTypes['case'] = '用例'; $lang->action->objectTypes['testtask'] = '测试任务'; +$lang->action->objectTypes['user'] = '用户'; /* 用来描述操作历史记录。*/ $lang->action->desc->common = '$date, $action by $actor'; @@ -94,5 +94,6 @@ $lang->action->label->bug = 'Bug|bug|view|bugID=%s'; $lang->action->label->case = '用例|testcase|view|caseID=%s'; $lang->action->label->testtask = '测试任务|testtask|view|caseID=%s'; $lang->action->label->todo = 'todo|todo|view|todoID=%s'; +$lang->action->label->user = '用户'; $lang->action->label->space = ' ';