diff --git a/module/my/config/table.php b/module/my/config/table.php index c304eaddc4..b0fc6ca2a5 100644 --- a/module/my/config/table.php +++ b/module/my/config/table.php @@ -447,7 +447,7 @@ $config->my->testtask = new stdclass(); $config->my->testtask->dtable = new stdclass(); $config->my->testtask->dtable->fieldList['id']['name'] = 'id'; $config->my->testtask->dtable->fieldList['id']['title'] = $lang->idAB; -$config->my->testtask->dtable->fieldList['id']['fixed'] = 'left'; +$config->my->testtask->dtable->fieldList['id']['type'] = 'id'; $config->my->testtask->dtable->fieldList['title']['name'] = 'name'; $config->my->testtask->dtable->fieldList['title']['title'] = $lang->testtask->name; @@ -482,11 +482,6 @@ $config->my->testtask->dtable->fieldList['end']['title'] = $lang->testtask->end; $config->my->testtask->dtable->fieldList['end']['type'] = 'date'; $config->my->testtask->dtable->fieldList['end']['group'] = 'user'; -$config->my->testtask->dtable->fieldList['status']['name'] = 'status'; -$config->my->testtask->dtable->fieldList['status']['title'] = $lang->testtask->status; -$config->my->testtask->dtable->fieldList['status']['type'] = 'status'; -$config->my->testtask->dtable->fieldList['status']['statusMap'] = $lang->testtask->statusList; - $config->my->testtask->dtable->fieldList['actions']['name'] = 'actions'; $config->my->testtask->dtable->fieldList['actions']['title'] = $lang->actions; $config->my->testtask->dtable->fieldList['actions']['type'] = 'actions'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 880da05228..f6d0330987 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -11,7 +11,7 @@ $lang->my->work = '待处理'; $lang->my->contribute = '贡献'; $lang->my->task = '我的任务'; $lang->my->bug = '我的Bug'; -$lang->my->myTestTask = '我的版本'; +$lang->my->myTestTask = '我的测试单'; $lang->my->myTestCase = '我的用例'; $lang->my->story = "我的{$lang->SRCommon}"; $lang->my->doc = "我的文档"; diff --git a/module/my/ui/testtask.html.php b/module/my/ui/testtask.html.php index fd22588252..2dca9bae09 100644 --- a/module/my/ui/testtask.html.php +++ b/module/my/ui/testtask.html.php @@ -26,7 +26,7 @@ dtable set::cols($cols), set::data($data), set::userMap($users), - set::fixedLeftWidth('44%'), + set::fixedLeftWidth('20%'), set::footer(array(array('html' => $footerHTML), 'flex', 'pager')), set::footPager(usePager()), ); diff --git a/module/testtask/model.php b/module/testtask/model.php index 0e7dbf9f4d..fed065f35a 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -332,7 +332,7 @@ class testtaskModel extends model */ public function getByUser($account, $pager = null, $orderBy = 'id_desc', $type = '') { - return $this->dao->select("t1.*, t2.name AS executionName, t2.multiple as executionMultiple, t5.name as projectName, t3.name AS buildName") + return $this->dao->select("t1.*, t2.name AS executionName, t2.multiple AS executionMultiple, t5.name AS projectName, t3.name AS buildName, t4.name AS productName") ->from(TABLE_TESTTASK)->alias('t1') ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id') ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build = t3.id')